Index: trunk/psModules/src/objects/pmTrend2D.c
===================================================================
--- trunk/psModules/src/objects/pmTrend2D.c	(revision 15413)
+++ trunk/psModules/src/objects/pmTrend2D.c	(revision 15417)
@@ -3,6 +3,6 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-10-29 22:34:29 $
+ *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-10-30 00:50:00 $
  *
  *  Copyright 2004 Institute for Astronomy, University of Hawaii
@@ -33,5 +33,4 @@
 pmTrend2D *pmTrend2DAlloc (pmTrend2DMode mode, psImage *image, int nXtrend, int nYtrend, psStats *stats)
 {
-<<<<<<< pmTrend2D.c
     PS_ASSERT_PTR_NON_NULL(stats, NULL);
     if (mode == PM_TREND_MAP) {