From: Marcus Brinkmann <mb@g10code.com>
Date: Tue, 20 Nov 2001 06:03:02 +0000 (+0000)
Subject: remove some CVS conflict cruft
X-Git-Tag: gpgme-1.2.0@1385~1274
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=01b5f56f83d57a402cfc8e67d688b4635da17ab0;p=gpgme.git

remove some CVS conflict cruft
---

diff --git a/trunk/gpgme/ChangeLog b/trunk/gpgme/ChangeLog
index 87e93c1..b6d17a2 100644
--- a/trunk/gpgme/ChangeLog
+++ b/trunk/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