From: MaxSMokeSkaarj <vnazarov@smokeofanarchy.ru>
Date: Mon, 24 Mar 2025 03:49:35 +0000 (+1000)
Subject: Автообновление SS14
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=dfae99081e61fa2758e9ec8b896bfc6adc002ef7;p=space-station-14.git

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

diff --git a/.github/workflows/update-credits.yml b/.github/workflows/update-credits.yml
index 7f85e4cd57..2acfb32cee 100644
--- a/.github/workflows/update-credits.yml
+++ b/.github/workflows/update-credits.yml
@@ -10,13 +10,8 @@ jobs:
     runs-on: ubuntu-latest
     # Hey there fork dev! If you like to include your own contributors in this then you can probably just change this to your own repo
     # Do this in dump_github_contributors.ps1 too into your own repo
-<<<<<<< HEAD
     if: github.repository == 'MaxSMokeSkaarj/space-station-14'
-    
-=======
-    if: github.repository == 'space-wizards/space-station-14'
 
->>>>>>> 7c9e344cd237a1a5290531dea35cd35a7461ffcf
     steps:
       - uses: actions/checkout@v4.2.2
         with: