From f07375a66b21e5fade1fd6ade5eb742f8f1e5b37 Mon Sep 17 00:00:00 2001
From: Jack Westbrook <jack.westbrook@gmail.com>
Date: Mon, 3 Mar 2025 11:57:00 +0100
Subject: [PATCH] ci(drone): fix stray conflict in yml config

---
 .drone.yml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index bc24cb94253..aa9c7b4a5f6 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -5563,10 +5563,6 @@ kind: secret
 name: gcr_credentials
 ---
 kind: signature
-<<<<<<< HEAD
-hmac: 46c36be68216e1dfe4f15f2742c5a72a577b2113471181462c046e3d9118d4cc
-=======
-hmac: 566cf7a3b6a161843de2efbb46781231a80cc94df48baaa3c483c2aae87c0589
->>>>>>> 7797582b714 (ci(versioning): update drone to version grafanaPackages,privatePackages,plugins nx groups)
+hmac: 950ed494abe239bcbd1771dcd1a49e365a2b5fba7f8e8613e015e14b21c13341
 
 ...