diff options
| -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 |