Skip to content
Snippets Groups Projects
Commit d5bccd5f authored by Andreas Hamacher's avatar Andreas Hamacher
Browse files

fixing merge conflict

parent 9c981fff
No related branches found
No related tags found
2 merge requests!381Yumadminpackage,!379Pipelinefix
......@@ -148,8 +148,4 @@
- name: enable roce_mode setting
service: name=roce_mode state=started enabled=yes
become: true
<<<<<<< HEAD
when: start_roce_service is undefined or start_roce_service is true
=======
when: start_roce_service is undefined or start_roce_service
>>>>>>> origin/master
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment