Merge branch 'master' into master

gjerdej · Sep 1, 2017 · 3e17521 · 3e17521
2 parents a543aa7 + af13e02
commit 3e17521
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,6 +2,7 @@ sudo: required
 dist: trusty
 language: cpp
 
+
 services: 
   - docker
 

diff --git a/test_ci.sh b/test_ci.sh
@@ -1 +1,2 @@
 echo Test Complete!
+
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,6 +2,7 @@ sudo: required @@
     dist: trusty
     language: cpp
     services:
       - docker
@@ Expand Down @@