Index: trunk/MagicSoft/Mars/manalysis/Makefile
===================================================================
--- trunk/MagicSoft/Mars/manalysis/Makefile	(revision 2663)
+++ trunk/MagicSoft/Mars/manalysis/Makefile	(revision 2664)
@@ -87,5 +87,4 @@
            MArrivalTimeCalc.cc \
            MMcCalibrationCalc.cc
->>>>>>> 1.65
 
 SRCS    = $(SRCFILES)