From c561374ae19dd33f3836035d0fc7170550c4bf1a Mon Sep 17 00:00:00 2001
From: tobi <tobi.smethurst@protonmail.com>
Date: Sun, 1 Sep 2024 17:42:45 +0200
Subject: [PATCH] sign

---
 .drone.yml | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 902f39aaf..ec96afdb3 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -94,11 +94,7 @@ steps:
           - pull_request
 
   - name: snapshot
-<<<<<<< HEAD
-    image: superseriousbusiness/gotosocial-drone-build:0.6.2 # https://github.com/superseriousbusiness/gotosocial-drone-build
-=======
     image: superseriousbusiness/gotosocial-drone-build:0.7.0 # https://github.com/superseriousbusiness/gotosocial-drone-build
->>>>>>> c1543c029 ([chore] Bump tooling versions, bump go -> v1.23.0)
     volumes:
       - name: go-build-cache
         path: /root/.cache/go-build
@@ -145,11 +141,7 @@ steps:
           - main
 
   - name: release
-<<<<<<< HEAD
-    image: superseriousbusiness/gotosocial-drone-build:0.6.2 # https://github.com/superseriousbusiness/gotosocial-drone-build
-=======
     image: superseriousbusiness/gotosocial-drone-build:0.7.0 # https://github.com/superseriousbusiness/gotosocial-drone-build
->>>>>>> c1543c029 ([chore] Bump tooling versions, bump go -> v1.23.0)
     volumes:
       - name: go-build-cache
         path: /root/.cache/go-build
@@ -218,11 +210,7 @@ clone:
 
 steps:
   - name: mirror
-<<<<<<< HEAD
-    image: superseriousbusiness/gotosocial-drone-build:0.6.2
-=======
     image: superseriousbusiness/gotosocial-drone-build:0.7.0
->>>>>>> c1543c029 ([chore] Bump tooling versions, bump go -> v1.23.0)
     environment:
       ORIGIN_REPO: https://github.com/superseriousbusiness/gotosocial
       TARGET_REPO: https://codeberg.org/superseriousbusiness/gotosocial
@@ -235,10 +223,6 @@ steps:
 
 ---
 kind: signature
-<<<<<<< HEAD
-hmac: 1b89e3a538fbca72eb9a0b398cd82f09a774ba3649013e19d36012eda327e83f
-=======
-hmac: 90df190a8e49e082ec2a95738bdf44fb049a7ab64b71f522e1f1add1bb061a81
->>>>>>> c1543c029 ([chore] Bump tooling versions, bump go -> v1.23.0)
+hmac: 9810bf692fb1029c13b0a1e2f556e2306d16f7d3eec9ca6163a0499c147280c1
 
 ...