From: MaxSMokeSkaarj <vnazarov@smokeofanarchy.ru>
Date: Fri, 9 May 2025 05:06:19 +0000 (+1000)
Subject: Автообновление SS14
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=cc9a2799dd29cc301f9eb536563f357b546eafa5;p=space-station-14.git

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

diff --git a/.github/workflows/publish-local.yml b/.github/workflows/publish-local.yml
index 9356e424e5..13b0fd67e9 100644
--- 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]