]> git.eshelyaron.com Git - emacs.git/commit
lisp/ChangeLog: Remove merge markers.
authorJuanma Barranquero <lekktu@gmail.com>
Wed, 18 Aug 2010 23:32:39 +0000 (01:32 +0200)
committerJuanma Barranquero <lekktu@gmail.com>
Wed, 18 Aug 2010 23:32:39 +0000 (01:32 +0200)
commit9b3d6a42efd17fb2a9f01b128b10b17da5296c98
treecde5aa4655232ddf9e60aca86669b4b4232a4e46
parenta67e6f13345ce7307ada22a8226da192f47299ac
lisp/ChangeLog: Remove merge markers.
lisp/ChangeLog