From b1f5ad415e2bca83b7b9cf84576e106de7f32e73 Mon Sep 17 00:00:00 2001
From: "Adam D. Moss" <adam@src.gnome.org>
Date: Wed, 17 Nov 1999 22:52:42 +0000
Subject: [PATCH] silly boys

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

diff --git a/ChangeLog b/ChangeLog
index 79e50bcec4..02198b7c1e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -48,7 +48,6 @@ Wed Nov 17 00:14:11 MET 1999  Sven Neumann <sven@gimp.org>
 	* po-plug-ins/POTFILES.in: made supernova, papertile and sinus use
 	the gimpcolorbutton, internationalized the plug-ins while I was on it
 
->>>>>>> 1.1821
 1999-11-16  Michael Natterer  <mitch@gimp.org>
 
 	* libgimp/gimpchainbutton.c: the chainbutton's parent_class is a