From 973662d5c374d2441b4aedbd9804cb9a8d7d9747 Mon Sep 17 00:00:00 2001
From: Havoc Pennington <hp@src.gnome.org>
Date: Sun, 12 May 2002 15:21:57 +0000
Subject: [PATCH] remove stray conflict marker

---
 ChangeLog | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 5f115a181..1d28a587e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -71,7 +71,6 @@
 	the calc_showing, don't focus it, it's probably on another
 	workspace or something.
 
->>>>>>> 1.239
 2002-05-09  Havoc Pennington  <hp@redhat.com>
 
 	* src/frames.c (show_tip_now): DefaultScreen() returns the screen