Fixing merge conflicts

2018-08-31 13:10:34 -04:00
parent 84eb306681 8f54341ea6
commit 7326ca4b26
8 changed files with 7 additions and 477 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,7 +9,6 @@ env:
 before_install:
  - sudo apt-get -qq update
  - sudo apt-get install -y libboost-test-dev
-  - sudo apt-get install -y libboost-thread-dev
  - sudo apt-get install -y swig 

 #install: