X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=collectsharedcommand.cpp;h=c5b8130e40a4dea5a18930c98a5db524b8de134f;hb=29351fe29c017d2225366418973ed0e000ce5293;hp=01a93434720a44fe7a108ae1d56ffa3b7320f32c;hpb=dd7e72614c024b1fb547ff9ea9451a89baeb3e7b;p=mothur.git

diff --git a/collectsharedcommand.cpp b/collectsharedcommand.cpp
index 01a9343..c5b8130 100644
--- a/collectsharedcommand.cpp
+++ b/collectsharedcommand.cpp
@@ -19,10 +19,8 @@
 #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"
@@ -31,7 +29,7 @@
 #include "sharedlennon.h"
 #include "sharedmorisitahorn.h"
 #include "sharedbraycurtis.h"
->>>>>>> 1.13
+
 
 
 //**********************************************************************************************************************