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 @@ -190,6 +190,7 @@ stackhpc_kolla_ansible_source_url: "https://github.com/stackhpc/kolla-ansible"
190190<<<<<<< HEAD
191191<<<<<<< HEAD
192192<<<<<<< HEAD
193+ <<<<<<< HEAD
193194stackhpc_kolla_ansible_source_version : stackhpc/20.2.0.9
194195=======
195196stackhpc_kolla_ansible_source_version : stackhpc/18.7.0.12
@@ -203,6 +204,9 @@ stackhpc_kolla_ansible_source_version: stackhpc/18.7.0.14
203204=======
204205stackhpc_kolla_ansible_source_version : stackhpc/18.7.0.15
205206>>>>>>> d53541f1 (Bump kolla-ansible to stackhpc/18.7.0.15)
207+ =======
208+ stackhpc_kolla_ansible_source_version : stackhpc/18.8.0.1
209+ >>>>>>> 57717c77 (Bump kolla-ansible to stackhpc/18.8.0.1)
206210
207211# ##############################################################################
208212# Container image registry
You can’t perform that action at this time.
0 commit comments