From 4721e4481fe7e0a5a58d1a377071b6d153405889 Mon Sep 17 00:00:00 2001
From: Chong Yidong <cyd@stupidchicken.com>
Date: Wed, 24 May 2006 14:25:50 +0000
Subject: [PATCH] Remove conflict indicators.

---
 lisp/ChangeLog | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3af8aad285b..7edd7b944ab 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -947,12 +947,10 @@
 	than alias `list-diary-entries'.
 
 2006-04-29  Dan Nicolaescu  <dann@ics.uci.edu>
->>>>>>> 1.9511
 
-<<<<<<< ChangeLog
 	* jit-lock.el (jit-lock-function): Check jit-lock-defer-timer is
 	active before setting 'fontified to 'defer.
-=======
+
 	* help-fns.el (describe-variable): Add info about safe local variables.
 
 2006-04-29  Richard Stallman  <rms@gnu.org>
@@ -2211,7 +2209,6 @@
 
 	* term/w32-win.el (mouse-set-font):
 	Mention w32-list-proportional-fonts in the doc string.
->>>>>>> 1.9511
 
 2006-03-18  Kim F. Storm  <storm@cua.dk>
 
-- 
2.39.5