From 8347edeb6817dff3fd27c4e1873f160d7ff26482 Mon Sep 17 00:00:00 2001
From: Pierre Fernique <pfernique@gmail.com>
Date: Fri, 26 Aug 2016 23:08:01 +0200
Subject: [PATCH] Update tests

---
 .travis.yml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6b9efb49..afb59f59 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -34,11 +34,6 @@ script:
   - conda install python-clanglite -c statiskit
   - conda install gitpython -c conda-forge
   - conda install scons -c statiskit
-<<<<<<< HEAD
-  - cd doc/examples/basic
-  - P=`python -c 'import autowig; print autowig.__path__[0]'`
-  - coverage run --source=$P $HOME/miniconda/bin/scons
-  - cd ../../..
   - nosetests test -x -s -v --with-coverage
 
 after_success: