From 883e83be42e8ff50cd1115295b79fa3ed12685b7 Mon Sep 17 00:00:00 2001
From: zhaoxiaomeng <xmzhao@mobvoi.com>
Date: Fri, 14 Apr 2017 17:25:02 +0800
Subject: [PATCH] Revert "Merge branch 'master' into master"

This reverts commit 0f5b6deb5e4ab3341c3f22d9ec83032db94a2f90, reversing
changes made to eb21e9d57236bcaebffb809ab76fb9d6e771ed51.
---
 .travis.yml        | 50 ----------------------------------------------
 util/libcrypto.num |  2 +-
 2 files changed, 1 insertion(+), 51 deletions(-)
 delete mode 100644 .travis.yml

diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 30266707..00000000
--- a/.travis.yml
+++ /dev/null
@@ -1,50 +0,0 @@
-dist: trusty
-sudo: required
-
-language: c
-cache: ccache
-git:
-    submodules: false
-
-before_install:
-    - if [ -n "$COVERALLS" ]; then
-          pip install --user cpp-coveralls;
-      fi;
-    - if expr "$CONFIG_OPTS" ":" ".*enable-external-tests" > /dev/null; then
-          git submodule update --init --recursive;
-      fi;
-
-addons:
-    apt:
-        packages:
-            - ccache
-            - golang-1.6
-
-os:
-    - linux
-
-compiler:
-    - clang
-    - gcc
-
-env:
-    - CONFIG_OPTS="no-paillier" DESTDIR="_install" 
-
-before_script:
-    - env
-    - pwd
-    - ls -l
-    - ./config -v $CONFIG_OPTS;
-
-script:
-    - if [ -z "$BUILDONLY" ]; then
-          make="make -s";
-      else
-          make="make";
-      fi
-    - $make update
-    - $make
-    - $make test
-    - $make install
-
-
diff --git a/util/libcrypto.num b/util/libcrypto.num
index d41a23f4..c9ce8e99 100644
--- a/util/libcrypto.num
+++ b/util/libcrypto.num
@@ -4928,4 +4928,4 @@ SM2CiphertextValue_new_from_ECCCipher   4872	1_1_0d	EXIST::FUNCTION:
 SM2CiphertextValue_set_ECCCipher        4873	1_1_0d	EXIST::FUNCTION:
 SM2CiphertextValue_get_ECCCIPHERBLOB    4874	1_1_0d	EXIST::FUNCTION:
 ECIES_PARAMS_init_with_type             4875	1_1_0d	EXIST::FUNCTION:
-BN_GFP2_one                             4876	1_1_0d	EXIST::FUNCTION:
\ No newline at end of file
+BN_GFP2_one                             4876	1_1_0d	EXIST::FUNCTION: