[pan: 13/21] Fic forgotten conflict.

[Dominique Dumont <ddumont src gnome org>]

commit 493de9d11f38a03ab8b32f76dd5dea9ab8937b04
Author: FoxMcCloud45 <foxmccloud45 hotmail com>
Date:   Wed Jul 7 09:20:37 2021 +0200

    Fic forgotten conflict.

 pan/usenet-utils/mime-utils.cc | 4 ----
 1 file changed, 4 deletions(-)
---
diff --git a/pan/usenet-utils/mime-utils.cc b/pan/usenet-utils/mime-utils.cc
index cfef002..4aeb4d1 100644
--- a/pan/usenet-utils/mime-utils.cc
+++ b/pan/usenet-utils/mime-utils.cc
@@ -1749,11 +1749,7 @@ namespace pan
 #ifdef HAVE_GMIME_30
     GMimeObject *gmo;
     gmo = g_mime_message_get_mime_part (body);
-<<<<<<< HEAD
     if (g_mime_multipart_signed_sign (gpg_ctx, gmo, uid.c_str(), &err) != NULL)
-=======
-    if (g_mime_multipart_signed_sign (gpg_ctx, gmo, uid.c_str(), &err) == NULL)
->>>>>>> face-support
 #else
     if (g_mime_multipart_signed_sign (mps, GMIME_OBJECT (part), gpg_ctx, uid.c_str(), 
GMIME_DIGEST_ALGO_SHA1, &err) <0)
 #endif