]> git.eshelyaron.com Git - emacs.git/commit
projects / emacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 87c7f58) | patch
Remove conflict marker.
authorJuanma Barranquero <lekktu@gmail.com>
Thu, 5 Dec 2002 07:26:01 +0000 (07:26 +0000)
committerJuanma Barranquero <lekktu@gmail.com>
Thu, 5 Dec 2002 07:26:01 +0000 (07:26 +0000)
commitc6526ebb2cc33daadec85c52c77130a14387f607
treee5cf2be9d5800f4e0d8476910fa3b08cdb107261tree | snapshot
parent87c7f58af9afcea2bf1993414d0cef2d98f0350dcommit | diff
Remove conflict marker.
lisp/ChangeLog diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.