Index: openacs-4/packages/forums/lib/message/threads-chunk.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/message/threads-chunk.tcl,v
diff -u -r1.7.2.1 -r1.7.2.2
--- openacs-4/packages/forums/lib/message/threads-chunk.tcl	4 Mar 2007 21:21:26 -0000	1.7.2.1
+++ openacs-4/packages/forums/lib/message/threads-chunk.tcl	26 Mar 2007 11:18:06 -0000	1.7.2.2
@@ -3,7 +3,6 @@
 
     @author Ben Adida (ben@openforce.net)
     @creation-date 2002-05-24
-<<<<<<< threads-chunk.tcl
     @cvs-id $Id$
 }