From 3744e88f010c0939e8ff862f68931ce03723286a Mon Sep 17 00:00:00 2001
From: Sylvain Arreckx <sylvain.arreckx@gmail.com>
Date: Sun, 12 Nov 2017 20:36:49 +0100
Subject: [PATCH] restore tests runs

---
 .travis.yml | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index bb4e3d5a21..bc7c2245fd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,9 +9,9 @@ script:
 
     # change to the current directory
     - cd $CURRENT_DIR
-    - echo $GIT_BRANCH
+
     # launch the tests
-    # - bash .ci/runtests.sh
+    - bash .ci/runtests.sh
 
 after_success:
     - if [ "$MATLAB_VER" == "R2016b" ]; then
@@ -21,9 +21,6 @@ after_success:
       pip install --upgrade --user -r docs/requirements.txt;
       export here=`pwd`;
       python ~/github_stats.py $here/docs/source/list_contributors.rst;
-<<<<<<< HEAD
-=======
-      python -c "from documenter.deploy import Documentation; doc = Documentation('github.com/opencobra/cobratoolbox', local_upstream='$here', ci='jenkins', latest='documentation', latest_dir='unstable'); doc.deploy()";
->>>>>>> build doc in unstable folder
+      python -c "from documenter.deploy import Documentation; doc = Documentation('github.com/opencobra/cobratoolbox', local_upstream='$here', ci='jenkins'); doc.deploy()";
       fi
       fi