Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

lisp/ChangeLog: Remove merge markers.

  • Loading branch information...
commit 71eab1406625791cdc0f0be0f8741e1e26184f29 1 parent 7a542ac
@lektu lektu authored
Showing with 0 additions and 1 deletion.
  1. +0 −1  lisp/ChangeLog
View
1  lisp/ChangeLog
@@ -73,7 +73,6 @@
(ctext-no-compositions): Doc fix.
(compound-text-with-extensions): Doc fix.
->>>>>>> MERGE-SOURCE
2010-08-04 Stefan Monnier <monnier@iro.umontreal.ca>
* simple.el (exchange-dot-and-mark): Mark obsolete, finally.
Please sign in to comment.
Something went wrong with that request. Please try again.