Commit 0273adca authored by Romain Francoise's avatar Romain Francoise
Browse files

Remove conflict marker.

parent 0d004377
......@@ -216,7 +216,6 @@
 
* subr.el (read-passwd): Bind `message-log-max' to nil.
 
>>>>>>> 1.9411
2006-04-12 Stefan Monnier <monnier@iro.umontreal.ca>
 
* progmodes/perl-mode.el (perl-indent-new-calculate):
......
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