mirror of
https://github.com/godotengine/godot.git
synced 2025-01-22 10:32:54 -05:00
CI: Fix badly resolved merge conflict from previous PR
This commit is contained in:
parent
01bf239576
commit
69962b74af
1 changed files with 0 additions and 4 deletions
4
.github/workflows/windows_builds.yml
vendored
4
.github/workflows/windows_builds.yml
vendored
|
@ -18,11 +18,7 @@ jobs:
|
|||
name: Editor (target=release_debug, tools=yes)
|
||||
|
||||
steps:
|
||||
<<<<<<< HEAD
|
||||
- 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
|
||||
# Editing this is pretty dangerous for Windows since it can break and needs to be properly tested with a fresh cache.
|
||||
|
|
Loading…
Reference in a new issue