From a54e06d9b55f3b9ff79cd8a992013c6e7e1cdda7 Mon Sep 17 00:00:00 2001
From: Fernando Pelliccioni <fpelliccioni@gmail.com>
Date: Wed, 27 Jun 2018 15:54:09 -0300
Subject: [PATCH] Feature ci test (#8)

* remove conan user file

* change version format

* conan_user is optional

* dummy commit

* dummy commit

* dummy commit
---
 .travis.yml    | 1 +
 CMakeLists.txt | 1 +
 README.md      | 1 +
 ci_utils       | 2 +-
 conan_user     | 1 -
 conan_version  | 2 +-
 conanfile.py   | 2 +-
 7 files changed, 6 insertions(+), 4 deletions(-)
 delete mode 100644 conan_user

diff --git a/.travis.yml b/.travis.yml
index d740e1ae43..8e816d95fc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,6 +21,7 @@ branches:
   only:
   # - master
   - dev
+  - feature_ci_test
   - /^v\d+\.\d+\.\d+$/
   - /^release-\d+\.\d+\.\d+$/
   - /^feature-ci-.+$/
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6f964ef706..dfac6d2825 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,6 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
+
 cmake_minimum_required(VERSION 3.4)
 
 # secp256k1
diff --git a/README.md b/README.md
index 971943751a..332ed8b30c 100644
--- a/README.md
+++ b/README.md
@@ -7,6 +7,7 @@ This library is a work in progress and is being used to research best practices.
 |:------:|:-:|:-:|:-:|
 | [![Build Status](https://travis-ci.org/bitprim/secp256k1.svg)](https://travis-ci.org/bitprim/secp256k1)       | [![Build StatusB](https://travis-ci.org/bitprim/secp256k1.svg?branch=dev)](https://travis-ci.org/bitprim/secp256k1?branch=dev)  | [![Appveyor Status](https://ci.appveyor.com/api/projects/status/github/bitprim/secp256k1?svg=true)](https://ci.appveyor.com/project/bitprim/secp256k1)  | [![Appveyor StatusB](https://ci.appveyor.com/api/projects/status/github/bitprim/secp256k1?branch=dev&svg=true)](https://ci.appveyor.com/project/bitprim/secp256k1?branch=dev)  |
 
+
 Features:
 * secp256k1 ECDSA signing/verification and key generation.
 * Adding/multiplying private/public keys.
diff --git a/ci_utils b/ci_utils
index 1341c8a436..39522e2b19 160000
--- a/ci_utils
+++ b/ci_utils
@@ -1 +1 @@
-Subproject commit 1341c8a436bb090ef08020f9691217a58e8b33dc
+Subproject commit 39522e2b1924027c3781d2db1f15eb99225dcdd8
diff --git a/conan_user b/conan_user
deleted file mode 100644
index 0f7da7ab6d..0000000000
--- a/conan_user
+++ /dev/null
@@ -1 +0,0 @@
-bitprim
\ No newline at end of file
diff --git a/conan_version b/conan_version
index e6adf3fc7b..60a2d3e96c 100644
--- a/conan_version
+++ b/conan_version
@@ -1 +1 @@
-0.4
\ No newline at end of file
+0.4.0
\ No newline at end of file
diff --git a/conanfile.py b/conanfile.py
index 44cdad6d15..8a1c483f76 100644
--- a/conanfile.py
+++ b/conanfile.py
@@ -88,7 +88,7 @@ class Secp256k1Conan(ConanFile):
     generators = "cmake"
     build_policy = "missing"
 
-    exports = "conan_version", "conan_req_version", "conan_user", "ci_utils/*"      #"conan_channel"
+    exports = "conan_version", "conan_req_version", "ci_utils/*"      #"conan_channel", "conan_user"
     exports_sources = "src/*", "include/*", "CMakeLists.txt", "cmake/*", "secp256k1Config.cmake.in", "contrib/*", "test/*"
     #, "bitprimbuildinfo.cmake"