diff options
| author | Glenn Morris <rgm@gnu.org> | 2014-03-23 10:56:34 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2014-03-23 10:56:34 -0700 |
| commit | 74b1f21db316d3c9c07df2796afd11de87ea8bb2 (patch) | |
| tree | c3e7bed0cbeab662b14d31b21358b3e651a235f0 /lisp/emacs-lisp/lisp-mode.el | |
| parent | 577b2ffd2d787506261ed758b086fb4257116dba (diff) | |
| download | emacs-74b1f21db316d3c9c07df2796afd11de87ea8bb2.tar.gz emacs-74b1f21db316d3c9c07df2796afd11de87ea8bb2.tar.bz2 emacs-74b1f21db316d3c9c07df2796afd11de87ea8bb2.zip | |
Fix up recent merge ChangeLog duplication
Perhaps the merge was done without using bzrmerge.el
Diffstat (limited to 'lisp/emacs-lisp/lisp-mode.el')
0 files changed, 0 insertions, 0 deletions