Browse Source

CI: Fix badly resolved merge conflict from previous PR

Rémi Verschelde 9 months ago
parent
commit
69962b74af
1 changed files with 0 additions and 4 deletions
  1. 0 4
      .github/workflows/windows_builds.yml

+ 0 - 4
.github/workflows/windows_builds.yml

@@ -18,11 +18,7 @@ jobs:
     name: Editor (target=release_debug, tools=yes)
     name: Editor (target=release_debug, tools=yes)
 
 
     steps:
     steps:
-<<<<<<< HEAD
     - uses: actions/checkout@v4
     - uses: actions/checkout@v4
-=======
-      - uses: actions/checkout@v4
->>>>>>> 6b202812ff (CI: Update all GitHub actions to their latest version)
 
 
       # Upload cache on completion and check it out now
       # Upload cache on completion and check it out now
       # Editing this is pretty dangerous for Windows since it can break and needs to be properly tested with a fresh cache.
       # Editing this is pretty dangerous for Windows since it can break and needs to be properly tested with a fresh cache.