test commit

likelet · Nov 12, 2017 · a176a4f · a176a4f
2 parents add26d0 + e95a7b1
commit a176a4f
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,8 +4,16 @@ sudo: fasle
 bioc_required: true
 bioc_use_devel: true
 
+<<<<<<< HEAD
 r_github_packages: 
   - hadley/devtools
+=======
+<<<<<<< HEAD
+r_github_packages: hadley/devtools
+
+=======
+>>>>>>> 0a10abea100b27503c2691ef12e51a96a77ab77b
+>>>>>>> e95a7b15588551f5ef0802495123995bb6f5f495
 r_packages:
   - covr