northern-lighthouse/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CI: Fix badly resolved merge conflict from previous PR

Browse Source
This commit is contained in:
Rémi Verschelde
2024-11-06 18:35:00 +01:00
parent 01bf239576
commit 69962b74af
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/windows_builds.yml vendored
View File

@ -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.