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

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

facc9ea8071cf63f52c66baef0215354cde0b745
diff --cc .github/workflows/update-credits.yml
index 7889604f90,eb609556d4..7f85e4cd57
--- a/.github/workflows/update-credits.yml
+++ b/.github/workflows/update-credits.yml
@@@ -10,13 -10,13 +10,18 @@@ 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@v3.6.0
+       - uses: actions/checkout@v4.2.2
          with:
            ref: master
-         
+ 
        - name: Get this week's Contributors
          shell: pwsh
          env:
diff --cc Corvax-SS14
index e76b0c396f,0000000000..1069d0c762
mode 160000,000000..160000
--- a/Corvax-SS14
+++ b/Corvax-SS14
@@@ -1,1 -1,0 +1,1 @@@
- Subproject commit e76b0c396f483ade5d15c03592c1147837aef5fd
++Subproject commit 1069d0c7624ac53b0a025402eb14385d8e8c16ab