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 | |
| 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 '')
| -rw-r--r-- | gpgme/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog index 87e93c14..b6d17a23 100644 --- a/gpgme/ChangeLog +++ b/gpgme/ChangeLog @@ -38,7 +38,6 @@ * ops.h (_gpgme_get_program_version): Add prototype for _gpgme_get_program_version (we expect to use it elsewhere soon). ->>>>>>> 1.44 2001-11-18 Marcus Brinkmann <[email protected]> * version.c (get_engine_info): If GnuPG is not available, return |