diff options
author | Marcus Brinkmann <[email protected]> | 2001-11-20 06:03:02 +0000 |
---|---|---|
committer | Marcus Brinkmann <[email protected]> | 2001-11-20 06:03:02 +0000 |
commit | 4d3ab72fe5d24f2ee4c1d56ed7d58ac915a6c4f8 (patch) | |
tree | 04652efc86711a85a12555d8ca081689f2acc4a7 /gpgme/passphrase.c | |
parent | 2001-11-20 Marcus Brinkmann <[email protected]> (diff) | |
download | gpgme-4d3ab72fe5d24f2ee4c1d56ed7d58ac915a6c4f8.tar.gz gpgme-4d3ab72fe5d24f2ee4c1d56ed7d58ac915a6c4f8.zip |
remove some CVS conflict cruft
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions