remove some CVS conflict cruft
authorMarcus Brinkmann <mb@g10code.com>
Tue, 20 Nov 2001 06:03:02 +0000 (06:03 +0000)
committerMarcus Brinkmann <mb@g10code.com>
Tue, 20 Nov 2001 06:03:02 +0000 (06:03 +0000)
gpgme/ChangeLog

index 87e93c1..b6d17a2 100644 (file)
@@ -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  <marcus@g10code.de>
 
        * version.c (get_engine_info): If GnuPG is not available, return