diff options
| author | Reiner Steib | 2005-05-20 17:47:03 +0000 |
|---|---|---|
| committer | Reiner Steib | 2005-05-20 17:47:03 +0000 |
| commit | 57d8ef63ee3d246f4726c7f0c28173b31faad58e (patch) | |
| tree | b2c0fbe8be1d09e47ec2100a0300df786a8bbf2d | |
| parent | 44a91a68ecab01fa130a3ad97fe070452b320c95 (diff) | |
| download | emacs-57d8ef63ee3d246f4726c7f0c28173b31faad58e.tar.gz emacs-57d8ef63ee3d246f4726c7f0c28173b31faad58e.zip | |
Remove CVS conflict markers.
| -rw-r--r-- | man/ChangeLog | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/man/ChangeLog b/man/ChangeLog index 077d393f521..e5997fab28b 100644 --- a/man/ChangeLog +++ b/man/ChangeLog | |||
| @@ -2,12 +2,10 @@ | |||
| 2 | 2 | ||
| 3 | * org.texi: Version 3.09 | 3 | * org.texi: Version 3.09 |
| 4 | 4 | ||
| 5 | <<<<<<< ChangeLog | ||
| 6 | 2005-05-18 Carsten Dominik <dominik@science.uva.nl> | 5 | 2005-05-18 Carsten Dominik <dominik@science.uva.nl> |
| 7 | 6 | ||
| 8 | * reftex.texi: Version 4.28 | 7 | * reftex.texi: Version 4.28 |
| 9 | 8 | ||
| 10 | ======= | ||
| 11 | 2005-05-18 Luc Teirlinck <teirllm@auburn.edu> | 9 | 2005-05-18 Luc Teirlinck <teirllm@auburn.edu> |
| 12 | 10 | ||
| 13 | * buffers.texi (Select Buffer): Document `C-u M-g M-g'. | 11 | * buffers.texi (Select Buffer): Document `C-u M-g M-g'. |
| @@ -124,7 +122,6 @@ | |||
| 124 | 122 | ||
| 125 | * building.texi (Debugger Operation): Clarify previous change. | 123 | * building.texi (Debugger Operation): Clarify previous change. |
| 126 | 124 | ||
| 127 | >>>>>>> 1.574 | ||
| 128 | 2005-04-29 Carsten Dominik <dominik@science.uva.nl> | 125 | 2005-04-29 Carsten Dominik <dominik@science.uva.nl> |
| 129 | 126 | ||
| 130 | * org.texi: Version 3.08, structure reorganized. | 127 | * org.texi: Version 3.08, structure reorganized. |