diff options
| author | Romain Francoise <romain@orebokech.com> | 2008-10-12 09:17:13 +0000 |
|---|---|---|
| committer | Romain Francoise <romain@orebokech.com> | 2008-10-12 09:17:13 +0000 |
| commit | 69d31e51835237e7de0881d202cd2a66b446f45a (patch) | |
| tree | 6f4ed502094644dad62f8a1c1740faa3c6cc5182 /etc/ChangeLog | |
| parent | 864c974046643cafbd269cf3d8dd62a6125395ee (diff) | |
| download | emacs-69d31e51835237e7de0881d202cd2a66b446f45a.tar.gz | |
Delete leftover conflict markers.
Diffstat (limited to 'etc/ChangeLog')
| -rw-r--r-- | etc/ChangeLog | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/etc/ChangeLog b/etc/ChangeLog index f849a96a66e..6ea7ddebbfd 100644 --- a/etc/ChangeLog +++ b/etc/ChangeLog @@ -45,13 +45,11 @@ * PROBLEMS: * MACHINES: Remove VMS info. ->>>>>>> 1.736 2008-07-27 Dan Nicolaescu <dann@ics.uci.edu> * PROBLEMS: * MACHINES: Remove mentions of Mac Carbon. ->>>>>>> 1.727 2008-07-24 Vinicius Jose Latorre <viniciusjl@ig.com.br> * NEWS: New function `diff-show-trailing-blanks' in diff-mode.el. |