Index: trunk/MagicSoft/Mars/mfileio/MCT1ReadPreProc.cc
===================================================================
--- trunk/MagicSoft/Mars/mfileio/MCT1ReadPreProc.cc	(revision 1583)
+++ trunk/MagicSoft/Mars/mfileio/MCT1ReadPreProc.cc	(revision 1584)
@@ -405,10 +405,5 @@
 
     struct filterresults filterres;
-<<<<<<< MCT1ReadPreProc.cc
-    fIn->read(&filterres, sizeof(struct filterresults));
-
-=======
     fIn->read((Byte_t*)&filterres, sizeof(struct filterresults));
->>>>>>> 1.2
     /*
      int   imax_alt_arcs;            // maximum altitude reached during the run