From 3c764ee891387430e0f902c3dbb671906b8e7c89 Mon Sep 17 00:00:00 2001
From: Kelly Martin <kelly@src.gnome.org>
Date: Tue, 28 Mar 2000 15:55:02 +0000
Subject: [PATCH] Removed a stray conflict marker from ChangeLog.

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

diff --git a/ChangeLog b/ChangeLog
index bb2a096ade..917f86072d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -197,7 +197,6 @@ Sat Mar 25 20:57:24 CET 2000  Stanislav Brabec  <utx@penguin.cz>
 	busy. This is not really what we want but at least it prevents
 	crashes.
 
->>>>>>> 1.2476
 2000-03-25  Sven Neumann  <sven@gimp.org>
 
 	* plug-ins/script-fu/script-fu-console.c: only call gtk_main_quit()