diff options
| author | PTPi <PTPi> | 2009-03-26 21:37:06 +0000 |
|---|---|---|
| committer | PTPi <PTPi> | 2009-03-26 21:37:06 +0000 |
| commit | a292e3283129e8ae00d62b6f5fd6d393d8431229 (patch) | |
| tree | 609d9dfc7811185fb2f5278c5d64ea8b0d1b1f05 /contrib | |
| parent | 4e741381ff4b64e3eedc6127fe28d9ed31af90e9 (diff) | |
| download | groff-a292e3283129e8ae00d62b6f5fd6d393d8431229.tar.gz | |
Fixed cvs conflict markers.
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/mom/ChangeLog | 2 |
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 |