Merge remote-tracking branch 'upstream/master'

ataudt · Oct 27, 2017 · 479a474 · 479a474
2 parents e31f22e + 7025a88
commit 479a474
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/README.md b/README.md
@@ -23,7 +23,11 @@ To install the *development* version from Github, follow the steps given below.
 	 library(devtools)  
 	 install_github("ataudt/aneufinderData")  
 	 install_github("ataudt/aneufinder")  
+<<<<<<< HEAD
 	 #### Or alternatively if the above line doesn't work:  
+=======
+	 # Or alternatively if the above line doesn't work:  
+>>>>>>> upstream/master
 	 install_git("git://github.com/ataudt/aneufinderData.git", branch = "master")  
 	 install_git("git://github.com/ataudt/aneufinder.git", branch = "master")