Fix bad commit
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