[Groff-commit] groff/contrib/mom ChangeLog

[Peter Schaffter]

CVSROOT:        /sources/groff
Module name:    groff
Changes by:     Peter Schaffter <PTPi>  09/03/26 21:37:07

Modified files:
        contrib/mom    : ChangeLog 

Log message:
        Fixed cvs conflict markers.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/mom/ChangeLog?cvsroot=groff&r1=1.61&r2=1.62

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/groff/groff/contrib/mom/ChangeLog,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -b -r1.61 -r1.62
--- ChangeLog   7 Mar 2009 14:33:29 -0000       1.61
+++ ChangeLog   26 Mar 2009 21:37:06 -0000      1.62
@@ -1,4 +1,3 @@
-<<<<<<< ChangeLog
 * Sat Jan 17 2009
 
 o Changed FAMILY, FT and PT_SIZE requests in DO_COVER to groff
@@ -26,7 +25,6 @@
 
 o Makefile.sub (CLEANADD): Add om.tmac-s.
 
->>>>>>> 1.60
 * Tue Dec 30 2008
 
 o Doc fixes in toc.html