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

diff --cc .github/workflows/publish-local.yml
index 13b0fd67e972b74f87c9f35b61776e8c90b6101e,6dacef13244dbb027bb1c89730b2992bcc25fd07..9356e424e5e171c999dafa2c2bc1781e771c0c81
--- 1/.github/workflows/publish-local.yml
--- 2/.github/workflows/publish-testing.yml
+++ b/.github/workflows/publish-local.yml
@@@ -1,9 -1,13 +1,14 @@@
 -name: Publish Testing
 +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:
 -  workflow_dispatch:
 -  schedule:
 -  - cron: '0 10 * * *'
 +on: [push]
  
  jobs:
    build:

diff --cc .github/workflows/publish.yml
index 78e2740f082054be9cd526550223473b000c114c,029439563267b61fe01d30d7b1c29a2d583769aa..7411a8800987e6a271d368925857130a5ccad0f0
--- 1/.github/workflows/publish.yml
--- 2/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@@ -2,8 -2,12 +2,9 @@@ name: Publis
  
  concurrency:
    group: publish
+   cancel-in-progress: true
  
 -on:
 -  workflow_dispatch:
 -  # schedule:
 -   # - cron: '0 10 * * *'
 +on: [push]
  
  jobs:
    build: