Index: openacs-4/packages/imsld/tcl/imsld-monitor-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/tcl/imsld-monitor-procs.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/imsld/tcl/imsld-monitor-procs.tcl	4 Nov 2008 13:42:04 -0000	1.6
+++ openacs-4/packages/imsld/tcl/imsld-monitor-procs.tcl	13 Nov 2008 23:50:16 -0000	1.7
@@ -5,7 +5,11 @@
     
     @creation-date Nov 2006
     @author jopez@inv.it.uc3m.es
+<<<<<<< imsld-monitor-procs.tcl
     @cvs-id $Id$
+=======
+    @cvs-id $Id$
+>>>>>>> 1.6
 }
 
 namespace eval imsld::monitor {}