make drone

2025-05-02 16:24:57 -06:00
parent 8974846bf2
commit 6ca4dd4697
1 changed files with 1 additions and 5 deletions
@@ -4836,10 +4836,6 @@ kind: secret
 name: gcr_credentials
 ---
 kind: signature
-<<<<<<< HEAD
+hmac: 77cf486cba59cee56db9edbbfeee4997cd22bc9060dd854639e2ae44822dc080
 hmac: 32062cc16a9cda77f033fcc9d3d68eb488b436de68b787dd904a4c37885c04a3
 =======
 hmac: 38513409bb4d2834e2140e41a9873c81052683ad8d9c86f3136060c44d099b6f
 >>>>>>> fd4afdbd2c (CI: Use docker creds from ci/common (#104827))
 ...