Remove CI conflict markers

This commit is contained in:
93jun 2026-07-06 14:43:04 +09:00
parent 1011113914
commit 5ad5bd94bf

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