From a292e3283129e8ae00d62b6f5fd6d393d8431229 Mon Sep 17 00:00:00 2001
From: PTPi <PTPi>
Date: Thu, 26 Mar 2009 21:37:06 +0000
Subject: Fixed cvs conflict markers.

---
 contrib/mom/ChangeLog | 2 --
 1 file changed, 2 deletions(-)

(limited to 'contrib')

diff --git a/contrib/mom/ChangeLog b/contrib/mom/ChangeLog
index a990eee6..d33edce9 100644
--- a/contrib/mom/ChangeLog
+++ b/contrib/mom/ChangeLog
@@ -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 Default definition of $QUOTE0 and $QUOTE1 in om.tmac changed from
 
 o Makefile.sub (CLEANADD): Add om.tmac-s.
 
->>>>>>> 1.60
 * Tue Dec 30 2008
 
 o Doc fixes in toc.html
-- 
cgit v1.2.1