Index: trunk/MagicSoft/Mars/mfileio/MCT1ReadPreProc.cc
===================================================================
--- trunk/MagicSoft/Mars/mfileio/MCT1ReadPreProc.cc	(revision 1745)
+++ trunk/MagicSoft/Mars/mfileio/MCT1ReadPreProc.cc	(revision 1747)
@@ -431,15 +431,12 @@
     fIn->read((Byte_t*)&outpars, sizeof(struct outputpars));
 
-<<<<<<< MCT1ReadPreProc.cc
-    return ProcessRunHeader(outpars);
-=======
     ProcessRunHeader(outpars);
 
     //rwagner: ReInit whenever new run commences
     // rc==-1 means: ReInit didn't work out
-    if (!fTaskList->ReInit(fParList)) return -1;
+    if (!fTaskList->ReInit(fParList))
+        return -1;
 
     return kTRUE;
->>>>>>> 1.13
 }