summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--contrib/mom/ChangeLog2
1 files changed, 0 insertions, 2 deletions
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