diff options
| -rw-r--r-- | lisp/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 735b1c56c31..233a72e79df 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -131,7 +131,6 @@ | |||
| 131 | * subr.el (with-silent-modifications): Don't bind deactivate-mark, | 131 | * subr.el (with-silent-modifications): Don't bind deactivate-mark, |
| 132 | buffer-file-name, and buffer-file-truename any more. | 132 | buffer-file-name, and buffer-file-truename any more. |
| 133 | 133 | ||
| 134 | >>>>>>> MERGE-SOURCE | ||
| 135 | 2014-04-08 Leo Liu <sdl.web@gmail.com> | 134 | 2014-04-08 Leo Liu <sdl.web@gmail.com> |
| 136 | 135 | ||
| 137 | Use lexical-binding and require cl-lib. | 136 | Use lexical-binding and require cl-lib. |