From 8208cb72bd16d0f2e14a8b4b471a1b8879d2f2d0 Mon Sep 17 00:00:00 2001
From: Manish Singh <yosh@src.gnome.org>
Date: Tue, 26 Oct 1999 05:42:47 +0000
Subject: [PATCH] conflict remnant

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

diff --git a/ChangeLog b/ChangeLog
index a795b47ae2..ae77809b33 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -297,7 +297,6 @@ Thu Oct 19 05:30:11 BST 1999 Nick Lamb <njl195@zepler.org>
 
 	* app/image_new.c: Still using RGB_IMAGE instead of GIMAGE (!)
 	
->>>>>>> 1.1725
 Mon Oct 18 21:24:47 BST 1999 Andy Thomas <alt@gimp.org>
 
 	* app/bezier_select.c