procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

lisp/ChangeLog: Remove merge marker.

Browse source
This commit is contained in:
Juanma Barranquero 2014-04-16 12:03:38 +02:00
parent 5f6b415477
commit 9dcd90f769
1 changed files with 0 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lisp/ChangeLog
View file

@ -131,7 +131,6 @@
* subr.el (with-silent-modifications): Don't bind deactivate-mark,
buffer-file-name, and buffer-file-truename any more.
>>>>>>> MERGE-SOURCE
2014-04-08 Leo Liu <sdl.web@gmail.com>
Use lexical-binding and require cl-lib.