summaryrefslogtreecommitdiff
path: root/lisp/smerge-mode.el
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2011-01-02 10:58:36 -0800
committerGlenn Morris <rgm@gnu.org>2011-01-02 10:58:36 -0800
commitd12f22f52cb7bb18b46f5ea8de5d8e8e04733e3f (patch)
tree84644d5959a1ed6395a583d006d5b36973a5048e /lisp/smerge-mode.el
parent2a8a455e77ee928a76268ab1ff5be1787af6525a (diff)
downloademacs-d12f22f52cb7bb18b46f5ea8de5d8e8e04733e3f.tar.gz
Remove duplicate ChangeLog entry.
Diffstat (limited to 'lisp/smerge-mode.el')
0 files changed, 0 insertions, 0 deletions