Merge branch 'master' into append_probabilities

DeclareDesign · Jun 2, 2018 · d8a4aaa · d8a4aaa
2 parents a7a2b2b + e7a2eb5
commit d8a4aaa
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -9,7 +9,7 @@ matrix:
       r: release
 
     - os: linux
-      r: oldrel
+      r: 3.4
       r_github_packages:
       - jyypma/nloptr
       after_success:
@@ -31,7 +31,7 @@ matrix:
 
     - os: osx
       osx_image: xcode6.4
-      r: oldrel
+      r: 3.4
       r_github_packages:
       - HenrikBengtsson/future.apply
       - DeclareDesign/DDtools