]> git.eshelyaron.com Git - emacs.git/commit
Remove traces of merge conflicts.
authorEli Zaretskii <eliz@gnu.org>
Wed, 6 Feb 2002 16:24:25 +0000 (16:24 +0000)
committerEli Zaretskii <eliz@gnu.org>
Wed, 6 Feb 2002 16:24:25 +0000 (16:24 +0000)
commit262d4e892d2c8fd993f04b404fe06c2897e3c5ca
tree55af749b63c8fd7492c9495f786f6914859138a5
parent108eaabb6b8fd0deb527e0b53b3d0cbf731e280a
Remove traces of merge conflicts.
lisp/ChangeLog