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 /sm/import.c | |
| 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 'sm/import.c')
0 files changed, 0 insertions, 0 deletions