From df0b884452b052487c21fec1a1a3909f982f6c82 Mon Sep 17 00:00:00 2001
From: Maurits Rijk <maurits@src.gnome.org>
Date: Fri, 24 May 2002 12:31:01 +0000
Subject: [PATCH] Fixes #82499 (small typo) and adds mnemonics.

---
 ChangeLog | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 2c45d031d4..612d0e2665 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+<<<<<<< ChangeLog
+2002-05-24  Maurits Rijk  <lpeek.mrijk@consunet.nl>
+
+	* plug-ins/common/checkerboard.c: fix for #82499 (small typo) and also 
+	adds mnemonics
+
+=======
 2002-05-24  Sven Neumann  <sven@gimp.org>
 
 	* app/core/cpercep.[ch]
@@ -5,6 +12,7 @@
 	* app/paint-funcs/paint-funcs.c: removed C++ style comments and
 	compiler warnings.
 
+>>>>>>> 1.4411
 2002-05-24  Michael Natterer  <mitch@gimp.org>
 
 	* app/config/gimpconfig.[ch]