From 4d3ab72fe5d24f2ee4c1d56ed7d58ac915a6c4f8 Mon Sep 17 00:00:00 2001 From: Marcus Brinkmann Date: Tue, 20 Nov 2001 06:03:02 +0000 Subject: [PATCH] remove some CVS conflict cruft --- gpgme/ChangeLog | 1 - 1 file changed, 1 deletion(-) diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog index 87e93c1..b6d17a2 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 * version.c (get_engine_info): If GnuPG is not available, return -- 2.26.2