File tree Expand file tree Collapse file tree 1 file changed +4
-0
lines changed
Expand file tree Collapse file tree 1 file changed +4
-0
lines changed Original file line number Diff line number Diff line change @@ -185,6 +185,7 @@ stackhpc_kolla_ansible_source_url: "https://github.com/stackhpc/kolla-ansible"
185185<<<<<<< HEAD
186186<<<<<<< HEAD
187187<<<<<<< HEAD
188+ <<<<<<< HEAD
188189stackhpc_kolla_ansible_source_version : stackhpc/20.2.0.9
189190=======
190191stackhpc_kolla_ansible_source_version : stackhpc/18.7.0.12
@@ -195,6 +196,9 @@ stackhpc_kolla_ansible_source_version: stackhpc/18.7.0.13
195196=======
196197stackhpc_kolla_ansible_source_version : stackhpc/18.7.0.14
197198>>>>>>> 5eb18c86 (Bump kolla-ansible to stackhpc/18.7.0.14 (#1856))
199+ =======
200+ stackhpc_kolla_ansible_source_version : stackhpc/18.7.0.15
201+ >>>>>>> d53541f1 (Bump kolla-ansible to stackhpc/18.7.0.15)
198202
199203# ##############################################################################
200204# Container image registry
You can’t perform that action at this time.
0 commit comments