diff options
| author | Andreas Schwab <schwab@suse.de> | 2005-07-20 10:01:38 +0000 |
|---|---|---|
| committer | Andreas Schwab <schwab@suse.de> | 2005-07-20 10:01:38 +0000 |
| commit | 7ce3c4661fa923ab3936e8b68b3e3d11389de6bc (patch) | |
| tree | aed49d7f6e08b842910e8fd743dd035f9dbe4516 /man/ChangeLog | |
| parent | 9827d1ab0f15aadcb8bea27f81eb2852f5297b68 (diff) | |
| download | emacs-7ce3c4661fa923ab3936e8b68b3e3d11389de6bc.tar.gz | |
Remove conflict markers.
Diffstat (limited to 'man/ChangeLog')
| -rw-r--r-- | man/ChangeLog | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/man/ChangeLog b/man/ChangeLog index 341be9a3e42..43edb631b9c 100644 --- a/man/ChangeLog +++ b/man/ChangeLog @@ -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'. |