From: Romain Francoise <romain@orebokech.com>
Date: Wed, 19 Apr 2006 06:29:47 +0000 (+0000)
Subject: Remove conflict marker.
X-Git-Tag: emacs-pretest-22.0.90~3056
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0273adca6b75932e731f1e042c347e35bff93f71;p=emacs.git

Remove conflict marker.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 10607fce53b..b445532262c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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):