diff --git a/g10/ChangeLog b/g10/ChangeLog
index 7d73643a2..34dbb2cb3 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -132,7 +132,6 @@
 	* exec.c, export.c, import.c, keyedit.c, keyserver.c, misc.c:
 	"Warning" -> "WARNING"
 
->>>>>>> 1.214
 2002-07-24  David Shaw  <dshaw@jabberwocky.com>
 
 	* main.h, import.c (parse_import_options, fix_hkp_corruption,