ci(drone): fix stray conflict in yml config

2025-03-03 11:57:00 +01:00
parent ec8b528610
commit f07375a66b
1 changed files with 1 additions and 5 deletions
@@ -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

 ...