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 -r1.69 -r1.70
--- openacs-4/packages/imsld/tcl/imsld-parse-procs.tcl	23 Oct 2008 17:31:57 -0000	1.69
+++ openacs-4/packages/imsld/tcl/imsld-parse-procs.tcl	13 Nov 2008 23:50:16 -0000	1.70
@@ -5,7 +5,11 @@
     
     @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 {}