summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp
diff options
context:
space:
mode:
authorStefan Kangas <stefankangas@gmail.com>2022-12-16 08:47:27 +0100
committerStefan Kangas <stefankangas@gmail.com>2022-12-16 08:47:27 +0100
commit4331771222fe670bd45c460b5e4f68e0dd4dc3c1 (patch)
tree65f6a883b481f74e504ef3906034198c7f0ef206 /lisp/emacs-lisp
parent03892d4f7c1253bc1affeedd227eb0a1520de90e (diff)
downloademacs-4331771222fe670bd45c460b5e4f68e0dd4dc3c1.tar.gz
emacs-4331771222fe670bd45c460b5e4f68e0dd4dc3c1.tar.bz2
emacs-4331771222fe670bd45c460b5e4f68e0dd4dc3c1.zip
; Fix merge errors
Diffstat (limited to 'lisp/emacs-lisp')
0 files changed, 0 insertions, 0 deletions