Removed a leftover conflict indicator.
authorWerner Koch <wk@gnupg.org>
Fri, 16 Aug 2002 07:14:29 +0000 (07:14 +0000)
committerWerner Koch <wk@gnupg.org>
Fri, 16 Aug 2002 07:14:29 +0000 (07:14 +0000)
g10/ChangeLog

index 7d73643..34dbb2c 100644 (file)
        * 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,