diff options
| author | Reiner Steib <[email protected]> | 2005-05-20 17:47:03 +0000 |
|---|---|---|
| committer | Reiner Steib <[email protected]> | 2005-05-20 17:47:03 +0000 |
| commit | 57d8ef63ee3d246f4726c7f0c28173b31faad58e (patch) | |
| tree | b2c0fbe8be1d09e47ec2100a0300df786a8bbf2d /man | |
| parent | 44a91a68ecab01fa130a3ad97fe070452b320c95 (diff) | |
Remove CVS conflict markers.
Diffstat (limited to 'man')
| -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. |