# HG changeset patch
# User Romain Francoise <romain@orebokech.com>
# Date 1145428187 0
# Node ID 9f68cc95e2dad3c56f1f38f1e4defcdbd529e529
# Parent  ce4a07c75843a786aa7a2bed766335aa55ec1645
Remove conflict marker.

diff -r ce4a07c75843 -r 9f68cc95e2da lisp/ChangeLog
--- a/lisp/ChangeLog	Tue Apr 18 23:50:28 2006 +0000
+++ b/lisp/ChangeLog	Wed Apr 19 06:29:47 2006 +0000
@@ -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):