diff options
author | Werner Koch <[email protected]> | 2002-08-01 10:16:21 +0000 |
---|---|---|
committer | Werner Koch <[email protected]> | 2002-08-01 10:16:21 +0000 |
commit | b94497bf1f9e5b28767b992dd14a624809421801 (patch) | |
tree | 2d99caf8b724ccce9e99ecc12b1220dd97ee3bfd /tests/gpg/t-edit.c | |
parent | new cryptplug function importCertificateFromMem() (diff) | |
download | gpgme-b94497bf1f9e5b28767b992dd14a624809421801.tar.gz gpgme-b94497bf1f9e5b28767b992dd14a624809421801.zip |
Fixed an update conflict.
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions