]> git.eshelyaron.com Git - emacs.git/commit
lisp/ChangeLog: Remove merge marker.
authorJuanma Barranquero <lekktu@gmail.com>
Wed, 16 Apr 2014 10:03:38 +0000 (12:03 +0200)
committerJuanma Barranquero <lekktu@gmail.com>
Wed, 16 Apr 2014 10:03:38 +0000 (12:03 +0200)
commit9dcd90f7693f4eabdfae4f29cd1c40a4d3385529
treec0cf7cbc53b70a11460a5b9502734269030d0834
parent5f6b41547797de0997f2e757040c0f7e7dc35852
lisp/ChangeLog: Remove merge marker.
lisp/ChangeLog