diff options
author | Reiner Steib <Reiner.Steib@gmx.de> | 2008-02-10 14:08:03 +0000 |
---|---|---|
committer | Reiner Steib <Reiner.Steib@gmx.de> | 2008-02-10 14:08:03 +0000 |
commit | eaf6a1df4b1f8e66353096a0baa36eaaafa58ddb (patch) | |
tree | 9087e2966e5e51e8c11f70d8872e2658f6a37e61 /lisp/emacs-lisp/generic.el | |
parent | e8455367a483819190a8cc21d24a2e6519ff7da4 (diff) | |
download | emacs-eaf6a1df4b1f8e66353096a0baa36eaaafa58ddb.tar.gz emacs-eaf6a1df4b1f8e66353096a0baa36eaaafa58ddb.tar.bz2 emacs-eaf6a1df4b1f8e66353096a0baa36eaaafa58ddb.zip |
Remove bogus merge relicts from previous commit.
Diffstat (limited to 'lisp/emacs-lisp/generic.el')
0 files changed, 0 insertions, 0 deletions