From e78e69f37a977a283a6155850f79d4e8d5f9b3b2 Mon Sep 17 00:00:00 2001
From: Werner Koch <wk@gnupg.org>
Date: Fri, 16 Aug 2002 07:14:29 +0000
Subject: [PATCH] Removed a leftover conflict indicator.

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

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,