X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=collectsharedcommand.cpp;h=ec35dd601e75abd3ea7b65e32aabcaa1c13b1c90;hb=2657127a3e1f3b5463f2b3a3b49bc19843f5c9d2;hp=01a93434720a44fe7a108ae1d56ffa3b7320f32c;hpb=eb1c88346fb246e95a6b38935b103f95e38b82ca;p=mothur.git

diff --git a/collectsharedcommand.cpp b/collectsharedcommand.cpp
index 01a9343..ec35dd6 100644
--- a/collectsharedcommand.cpp
+++ b/collectsharedcommand.cpp
@@ -19,19 +19,17 @@
 #include "sharedsorest.h"
 #include "sharedthetayc.h"
 #include "sharedthetan.h"
-<<<<<<< collectsharedcommand.cpp
 #include "sharedkstest.h"
 #include "sharedbdiversity.h"
-=======
 #include "sharednseqs.h"
 #include "sharedochiai.h"
-#include "sharedanderberg.h"
+#include "sharedanderbergs.h"
 #include "sharedkulczynski.h"
 #include "sharedkulczynskicody.h"
 #include "sharedlennon.h"
 #include "sharedmorisitahorn.h"
 #include "sharedbraycurtis.h"
->>>>>>> 1.13
+
 
 
 //**********************************************************************************************************************