summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp/float-sup.el
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2004-04-15 20:46:54 +0000
committerStefan Monnier <monnier@iro.umontreal.ca>2004-04-15 20:46:54 +0000
commit2a3d70d45ddd62ab9be588303f0ea4a087fdbdc3 (patch)
tree8a5b32b5a7d3ea407d5ad77c936aa96f3cd04306 /lisp/emacs-lisp/float-sup.el
parent9f0c286d22c49f88af21e00532e2fd232f748c99 (diff)
downloademacs-2a3d70d45ddd62ab9be588303f0ea4a087fdbdc3.tar.gz
emacs-2a3d70d45ddd62ab9be588303f0ea4a087fdbdc3.tar.bz2
emacs-2a3d70d45ddd62ab9be588303f0ea4a087fdbdc3.zip
(smerge-match-conflict): Fix last change.
Diffstat (limited to 'lisp/emacs-lisp/float-sup.el')
0 files changed, 0 insertions, 0 deletions