commit 38dd66175b5db756f33011eb21f01c8c5c543368
author Mohammed Naser <mnaser@vexxhost.com> Mon Jun 17 16:11:46 2024 -0400
committer Mohammed Naser <mnaser@vexxhost.com> Mon Jun 17 16:11:46 2024 -0400
tree bea6632205ce1887833fef330a3648f567737da3
parent 9e933ba8620e2fc92e151d83283f43d2ca98cff7

Fix bad commit

zuul.d/project.yaml

diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index b0cdfbf..006f15e 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -130,11 +130,9 @@
                 soft: true
               - name: atmosphere-upload-container-image-placement
                 soft: true
-<<<<<<< HEAD
-              - name: atmosphere-upload-container-image-senlin
-=======
               - name: atmosphere-upload-container-image-python-openstackclient
->>>>>>> 72916807 (Add missing python-openstackclient dependency)
+                soft: true
+              - name: atmosphere-upload-container-image-senlin
                 soft: true
               - name: atmosphere-upload-container-image-staffeln
                 soft: true