diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 38675a6efb1..296b992508d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -997,7 +997,6 @@ * iswitchb.el (iswitchb-window-buffer-p): Use `member' instead of `memq' (Bug#8799). ->>>>>>> MERGE-SOURCE 2011-06-02 Stefan Monnier <monnier@iro.umontreal.ca> * subr.el (make-progress-reporter): Add "..." by default (bug#8785). |