remove some CVS conflict cruft

diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog
index 87e93c1434b7b12eb52fb9befb8f637353f432d9..b6d17a233c76e4a724444358d7835a72f9c9c6de 100644 (file)
--- 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  <marcus@g10code.de>
 
        * version.c (get_engine_info): If GnuPG is not available, return