From 48f10148e2e6f43cd2453b2ed84fcd02a348b7d0 Mon Sep 17 00:00:00 2001
From: Marc Lehmann <pcg@src.gnome.org>
Date: Sun, 16 May 1999 23:41:05 +0000
Subject: [PATCH] *** empty log message ***

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

diff --git a/ChangeLog b/ChangeLog
index 30cf0e758b..4d46fe37cc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -167,7 +167,6 @@ Wed May 12 12:13:57 PDT 1999 Manish Singh <yosh@gimp.org>
 
 	* tools/pdbgen/*: minor cleanups (no functional changes)
 
->>>>>>> 1.1106
 Wed May 12 15:14:25 EEST 1999 Lauri Alanko <nether@gimp.org>
 
 	* plug-ins/gfig/gfig.c: Updated calls to gimp_paintbrush to its