saltstack/salt-bootstrap
1
0
Fork 0
mirror of https://github.com/saltstack/salt-bootstrap.git synced 2025-04-16 09:40:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove conflicts

Browse source 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
This commit is contained in:
Pedro Algarvio 2022-08-12 15:07:20 +01:00 • committed by Pedro Algarvio
parent 2a1ba7fb09
commit 5333af4c9e
1 changed files with 0 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
kitchen.macos.yml
View file

@ -19,20 +19,10 @@ platforms:
- name: macos-1015 - name: macos-1015
suites: suites:
<<<<<<< HEAD
- name: py3-stable-3002
provisioner:
salt_version: 3002.8
- name: py3-stable-3003
provisioner:
salt_version: 3003.4
- name: py3-stable-3004
=======
- name: stable-3003 - name: stable-3003
provisioner: provisioner:
salt_version: 3003.4 salt_version: 3003.4
- name: stable-3004 - name: stable-3004
>>>>>>> origin/develop
provisioner: provisioner:
salt_version: 3004.1 salt_version: 3004.1
- name: latest - name: latest