Index: openacs-4/packages/lorsm/lib/user-lorsm.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/lib/user-lorsm.tcl,v
diff -u -r1.8.2.5 -r1.8.2.6
--- openacs-4/packages/lorsm/lib/user-lorsm.tcl	11 Jul 2006 19:19:36 -0000	1.8.2.5
+++ openacs-4/packages/lorsm/lib/user-lorsm.tcl	20 Nov 2006 20:00:27 -0000	1.8.2.6
@@ -7,11 +7,7 @@
     @author Ernie Ghiglione (ErnieG@mm.st)
     @creation-date 2004-06-15
     @arch-tag: 9d893919-9a02-45cd-b6ad-19e3a34ba747
-<<<<<<< user-lorsm.tcl
     @cvs-id $Id$
-=======
-    @cvs-id $Id$
->>>>>>> 1.8.2.4
 } {
     
 } -properties {