security-and-privacy/gnupg
security-and-privacy
/
gnupg
mirror of git://git.gnupg.org/gnupg.git
1
0
Fork 0
Code Releases Activity

Removed a leftover conflict indicator.

This commit is contained in:
Werner Koch 2002-08-16 07:14:29 +00:00
parent 0996f7d4df
commit e78e69f37a
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
g10/ChangeLog
View File

@ -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,