Commit 404a2a4b authored by Romain Francoise's avatar Romain Francoise
Browse files

Remove conflict marker.

parent cde6fe5c
......@@ -45,7 +45,6 @@
* desktop.el: Delete header line listing me as maintainer.
>>>>>>> 1.10749
2007-02-28 Glenn Morris <>
* tutorial.el (tutorial--describe-nonstandard-key): Tweak text in
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment