summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp/generic.el
diff options
context:
space:
mode:
authorReiner Steib <Reiner.Steib@gmx.de>2008-02-10 14:08:03 +0000
committerReiner Steib <Reiner.Steib@gmx.de>2008-02-10 14:08:03 +0000
commiteaf6a1df4b1f8e66353096a0baa36eaaafa58ddb (patch)
tree9087e2966e5e51e8c11f70d8872e2658f6a37e61 /lisp/emacs-lisp/generic.el
parente8455367a483819190a8cc21d24a2e6519ff7da4 (diff)
downloademacs-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