]> git.eshelyaron.com Git - emacs.git/commit
Delete leftover conflict markers.
authorRomain Francoise <romain@orebokech.com>
Sun, 12 Oct 2008 09:17:13 +0000 (09:17 +0000)
committerRomain Francoise <romain@orebokech.com>
Sun, 12 Oct 2008 09:17:13 +0000 (09:17 +0000)
commit69d31e51835237e7de0881d202cd2a66b446f45a
tree6f4ed502094644dad62f8a1c1740faa3c6cc5182
parent864c974046643cafbd269cf3d8dd62a6125395ee
Delete leftover conflict markers.
etc/ChangeLog