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

diff --git a/.github/workflows/update-credits.yml b/.github/workflows/update-credits.yml
index 7f85e4cd574e64bdcbcc5be8a6a0591fe4f40e00..2acfb32ceece1c2db07ad1faaae11bbd292a6134 100644 (file)
--- 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: