diff options
| author | Werner Koch <[email protected]> | 2002-08-16 07:14:29 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2002-08-16 07:14:29 +0000 |
| commit | e78e69f37a977a283a6155850f79d4e8d5f9b3b2 (patch) | |
| tree | 2cba3f2ffe55788c3988d8ca7dc87519c5b5f870 | |
| parent | * seckey-cert.c: Workaround to allow decryption of v3 keys created (diff) | |
| download | gnupg-e78e69f37a977a283a6155850f79d4e8d5f9b3b2.tar.gz gnupg-e78e69f37a977a283a6155850f79d4e8d5f9b3b2.zip | |
Removed a leftover conflict indicator.
Diffstat (limited to '')
| -rw-r--r-- | g10/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
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 <[email protected]> * main.h, import.c (parse_import_options, fix_hkp_corruption, |