mirror of
https://github.com/geerlingguy/ansible-role-certbot.git
synced 2026-08-03 18:51:20 +02:00
Merge pull request #254 from 93jun/fix-ci-conflict-markers
Remove CI conflict markers
This commit is contained in:
commit
1e5a11fd99
10
.github/workflows/ci.yml
vendored
10
.github/workflows/ci.yml
vendored
@ -50,16 +50,6 @@ jobs:
|
|||||||
- distro: debian12
|
- distro: debian12
|
||||||
playbook: converge.yml
|
playbook: converge.yml
|
||||||
experimental: false
|
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
|
- distro: rockylinux9
|
||||||
playbook: playbook-snap-install.yml
|
playbook: playbook-snap-install.yml
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user