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 @@ -175,6 +175,7 @@ stackhpc_kolla_source_url: "https://github.com/stackhpc/kolla"
175175<<<<<<< HEAD
176176<<<<<<< HEAD
177177<<<<<<< HEAD
178+ <<<<<<< HEAD
178179stackhpc_kolla_source_version : stackhpc/20.2.0.4
179180=======
180181stackhpc_kolla_source_version : stackhpc/18.7.0.11
@@ -191,6 +192,9 @@ stackhpc_kolla_source_version: stackhpc/18.8.0.1
191192=======
192193stackhpc_kolla_source_version : stackhpc/18.8.0.2
193194>>>>>>> 50cf6845 (Bump kolla to stackhpc/18.8.0.2)
195+ =======
196+ stackhpc_kolla_source_version : stackhpc/18.8.0.3
197+ >>>>>>> fb12106a (Bump kolla to stackhpc/18.8.0.3)
194198
195199# Kolla Ansible source repository.
196200stackhpc_kolla_ansible_source_url : " https://github.com/stackhpc/kolla-ansible"
You can’t perform that action at this time.
0 commit comments