diff options
| -rw-r--r-- | man/ChangeLog | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/man/ChangeLog b/man/ChangeLog index 077d393f52..e5997fab28 100644 --- a/man/ChangeLog +++ b/man/ChangeLog @@ -2,12 +2,10 @@ * org.texi: Version 3.09 -<<<<<<< ChangeLog 2005-05-18 Carsten Dominik <[email protected]> * reftex.texi: Version 4.28 -======= 2005-05-18 Luc Teirlinck <[email protected]> * buffers.texi (Select Buffer): Document `C-u M-g M-g'. @@ -124,7 +122,6 @@ * building.texi (Debugger Operation): Clarify previous change. ->>>>>>> 1.574 2005-04-29 Carsten Dominik <[email protected]> * org.texi: Version 3.08, structure reorganized. |