Index: openacs-4/packages/imsld/tcl/imsld-parse-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/tcl/imsld-parse-procs.tcl,v
diff -u -N -r1.70 -r1.71
--- openacs-4/packages/imsld/tcl/imsld-parse-procs.tcl	13 Nov 2008 23:50:16 -0000	1.70
+++ openacs-4/packages/imsld/tcl/imsld-parse-procs.tcl	13 Nov 2008 23:59:08 -0000	1.71
@@ -5,11 +5,7 @@
     
     @creation-date Jul 2005
     @author jopez@inv.it.uc3m.es
-<<<<<<< imsld-parse-procs.tcl
     @cvs-id $Id$
-=======
-    @cvs-id $Id$
->>>>>>> 1.69
 }
 
 namespace eval imsld {}