Update readme

Russel88 · Mar 2, 2017 · 7b368f7 · 7b368f7
1 parent 23ca7fc
commit 7b368f7
Showing 1 changed file with 0 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -2,21 +2,13 @@ RCon3D: Analyzing confocal images of microbial biofilms
 -------------------------------------------------------
 #### Acknowledgment note: 
 
-<<<<<<< HEAD
 
 An internal function, tiffToArray, is partly borrowed from <https://github.com/rmnppt/iMage>. 
 
 Furthermore, some of the algorithmic framework for the CrossCor and CrossRatio analysis is also borrowed from this repository.
 
 
 
-### Loading packages
-=======
-#### Acknowledgment note: 
-An internal function, tiffToArray, is partly borrowed from <https://github.com/rmnppt/iMage>. 
-Furthermore, some of the algorithmic framework for the CrossCor and CrossRatio analysis is also borrowed from this repository.
->>>>>>> 84951c11a0dbafcc123de0d2cb38f4a44142a852
-
 ### Loading packages
 
 First install the package