From 41959997b557e4488c55d801effead8eda703bb9 Mon Sep 17 00:00:00 2001
From: Max Howell <mxcl@me.com>
Date: Tue, 21 Nov 2023 08:21:26 -0500
Subject: [PATCH] how come I can commit merge annotations?

---
 projects/gnupg.org/gpg | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/projects/gnupg.org/gpg b/projects/gnupg.org/gpg
index 8cac3d74..87b7e8f6 100755
--- a/projects/gnupg.org/gpg
+++ b/projects/gnupg.org/gpg
@@ -5,16 +5,10 @@ etc="$d/../etc/gnupg"
 
 export GNUPGHOME="${GNUPGHOME:-"$etc"}"
 
-<<<<<<< HEAD
-mkdir -p "$etc"
-chmod 700 "$etc"
-cat << EOF > "$etc"/gpg.conf
-=======
 if [ ! -f "$etc/gpg.conf" ]; then
   mkdir -p "$etc"
   chmod 700 "$etc"
   cat << EOF > "$etc"/gpg.conf
->>>>>>> 055bba74 (deps on `*` considered harmful)
 use-agent
 pinentry-mode loopback
 agent-program $d/gpg-agent