🔧 remove merge conflict mess

PoisotLab · Apr 8, 2017 · 99e15f0 · 99e15f0
1 parent 8e36ff8
commit 99e15f0
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/src/labelpropagation.jl b/src/labelpropagation.jl
@@ -3,11 +3,7 @@
 
     most_common_label(N::ProbabilisticNetwork, L, sp)
 
-<<<<<<< HEAD
 Arguments are the network, the community partition, and the species id
-=======
-Arguments are the network, the community partition, and the species id.
->>>>>>> 7eeb2e530b56bb0bf5f01b67412911f3e312c4f2
 """
 function most_common_label(N::ProbabilisticNetwork, L, sp)