comparison src/emacs.c @ 109936:e1a5ebb1ce1c

lisp/ChangeLog: Remove merge markers.
author Juanma Barranquero <lekktu@gmail.com>
date Thu, 19 Aug 2010 01:32:39 +0200
parents db05908c4fc1
children 929a106309b7 376148b31b5e
comparison
equal deleted inserted replaced
109935:dbb2115db9d9 109936:e1a5ebb1ce1c