Merge pull request #254 from 93jun/fix-ci-conflict-markers

Remove CI conflict markers
This commit is contained in:
Jeff Geerling 2026-07-29 10:46:57 -05:00 committed by GitHub
commit 1e5a11fd99
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -50,16 +50,6 @@ jobs:
- distro: debian12
playbook: converge.yml
experimental: false
<<<<<<< Updated upstream
=======
- distro: debian10
playbook: converge.yml
experimental: false
# Source install started failing recently.
# - distro: centos7
# playbook: playbook-source-install.yml
# experimental: false
>>>>>>> Stashed changes
- distro: rockylinux9
playbook: playbook-snap-install.yml