Автообновление SS14

diff --git a/.github/workflows/publish-local.yml b/.github/workflows/publish-local.yml
index 9356e424e5e171c999dafa2c2bc1781e771c0c81..13b0fd67e972b74f87c9f35b61776e8c90b6101e 100644 (file)
--- a/.github/workflows/publish-local.yml
+++ b/.github/workflows/publish-local.yml
@@ -1,12 +1,7 @@
 name: Publish
 
 concurrency:
-<<<<<<< HEAD:.github/workflows/publish-local.yml
   group: publish
-=======
-  group: publish-testing
-  cancel-in-progress: true
->>>>>>> aafc166a363404a7c238db7cc75fa54a314dc6ba:.github/workflows/publish-testing.yml
 
 on: [push]