From b00d886cf875101c4e4a4ddcf381bd10138af1c0 Mon Sep 17 00:00:00 2001
From: Damon Chaplin <damon@src.gnome.org>
Date: Sat, 21 Oct 2000 15:41:19 +0000
Subject: removed conflict indicator

svn path=/trunk/; revision=6098
---
 calendar/ChangeLog | 1 -
 1 file changed, 1 deletion(-)

(limited to 'calendar')

diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 4928397f0b..6950b626ca 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -114,7 +114,6 @@
 	to 1 rather than 0, so if you move the hpane you'll see the date
 	navigator.
 
->>>>>>> 1.631
 2000-10-19  Jesse Pavel <jpavel@helixcode.com>
 
 	* gui/event-editor.[ch]: added a public function which causes the
-- 
cgit