From 32d86aae5e03965d7e357878878cfa47b0c363db Mon Sep 17 00:00:00 2001
From: clyhtsuriva <aimeric@adjutor.xyz>
Date: Wed, 9 Feb 2022 15:00:49 +0100
Subject: [PATCH] gnupg: update to 2.2.34

---
 srcpkgs/gnupg/template | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/srcpkgs/gnupg/template b/srcpkgs/gnupg/template
index 9f1bb8a27bb0..6e3a3f3ecd39 100644
--- a/srcpkgs/gnupg/template
+++ b/srcpkgs/gnupg/template
@@ -1,6 +1,14 @@
 # Template file for 'gnupg'
 pkgname=gnupg
+<<<<<<< HEAD
+<<<<<<< HEAD
 version=2.2.32
+=======
+version=2.2.34
+>>>>>>> 67909de272 (gnupg: update to 2.2.34)
+=======
+version=2.2.33
+>>>>>>> 6186daab9d (gnupg: update to 2.2.33)
 revision=1
 build_style=gnu-configure
 configure_args="$(vopt_enable ldap)
@@ -18,7 +26,15 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.gnupg.org/"
 distfiles="https://gnupg.org/ftp/gcrypt/gnupg/gnupg-${version}.tar.bz2"
+<<<<<<< HEAD
+<<<<<<< HEAD
 checksum=b2571b35f82c63e7d278aa6a1add0d73453dc14d3f0854be490c844fca7e0614
+=======
+checksum=562a3350dcf66cb67c5825c67ff2c2904db1e30ec8e1d353adc14efba9abf43f
+>>>>>>> 67909de272 (gnupg: update to 2.2.34)
+=======
+checksum=8688836e8c043d70410bb64d72de6ae15176e09ecede8d24528b4380c000e4e3
+>>>>>>> 6186daab9d (gnupg: update to 2.2.33)
 build_options="ldap"
 build_options_default="ldap"