Mercurial > emacs
changeset 64524:4b1847f05684
Remove conflict markers.
| author | Andreas Schwab <schwab@suse.de> |
|---|---|
| date | Wed, 20 Jul 2005 10:01:38 +0000 |
| parents | da15be47f5c0 |
| children | 83ccf4fe94c3 |
| files | man/ChangeLog |
| diffstat | 1 files changed, 0 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/man/ChangeLog Wed Jul 20 06:58:24 2005 +0000 +++ b/man/ChangeLog Wed Jul 20 10:01:38 2005 +0000 @@ -2,12 +2,10 @@ * org.texi: Version 3.14 -<<<<<<< ChangeLog 2005-07-04 Carsten Dominik <dominik@science.uva.nl> * org.texi: Version 3.13 -======= 2005-07-19 Juri Linkov <juri@jurta.org> * files.texi (Comparing Files): Mention resync for `compare-windows'.