CI: Fix badly resolved merge conflict from previous PR

This commit is contained in:
Rémi Verschelde 2024-11-06 18:35:00 +01:00
parent 01bf239576
commit 69962b74af
No known key found for this signature in database
GPG key ID: C3336907360768E1

View file

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