Index: /trunk/MagicSoft/Mars/manalysis/Makefile
===================================================================
--- /trunk/MagicSoft/Mars/manalysis/Makefile	(revision 1764)
+++ /trunk/MagicSoft/Mars/manalysis/Makefile	(revision 1765)
@@ -64,5 +64,4 @@
 	   MTrigLvl2.cc \
            MTrigLvl2FillTask.cc
->>>>>>> 1.31
 
 SRCS    = $(SRCFILES)