summaryrefslogtreecommitdiff
path: root/lisp/language/misc-lang.el
diff options
context:
space:
mode:
authorReiner Steib <Reiner.Steib@gmx.de>2006-09-15 09:03:48 +0000
committerReiner Steib <Reiner.Steib@gmx.de>2006-09-15 09:03:48 +0000
commitefce5ce20161481055bca6fe3fab25d6a54d0a3e (patch)
treeecc5b5ee6405fcb4324c779e1061055a7dec4cfd /lisp/language/misc-lang.el
parent91a2acb229ac102ef15866174fb2d62c8e36598c (diff)
downloademacs-efce5ce20161481055bca6fe3fab25d6a54d0a3e.tar.gz
emacs-efce5ce20161481055bca6fe3fab25d6a54d0a3e.tar.bz2
emacs-efce5ce20161481055bca6fe3fab25d6a54d0a3e.zip
Fix previous commit: Remove conflict marker. Undo unification of Pavel
Janik's name.
Diffstat (limited to 'lisp/language/misc-lang.el')
0 files changed, 0 insertions, 0 deletions