From a6b63ca177dd592bcaea527794016b37dae37024 Mon Sep 17 00:00:00 2001
From: Manish Singh <yosh@src.gnome.org>
Date: Thu, 2 Sep 1999 01:42:11 +0000
Subject: [PATCH] remove conflict chars

-Yosh
---
 ChangeLog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 914bbb07b6..6781318eb8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,7 +7,8 @@ Wed Sep  1 14:50:29 PDT 1999 Manish Singh <yosh@gimp.org>
 
 	* app/Makefile.am: added those files
 
-	* app/interface.c: use an hwrapbox for the toolbar
+	* app/interface.c: use an hwrapbox for the toolbar. Still not perfect
+	yet, working on it.
 
 	* app/gimpdrawable.c
 	* app/about_dialog.c
@@ -60,7 +61,6 @@ Wed Sep  1 23:18:21 BST 1999 Andy Thomas <alt@gimp.org>
 	the area shown is smaller than the overall image size. Thanks to tml
 	for the idea. 
 
->>>>>>> 1.1481
 Wed Sep  1 22:28:09 BST 1999 Adam D. Moss <adam@gimp.org>
 
 	* app/gradient.c