fixing merge conflict

d5bccd5f · Andreas Hamacher · 9c981fff · d5bccd5f
Commit d5bccd5f authored 4 years ago by Andreas Hamacher
--- a/roles/mellanox_drivers/tasks/main.yml
+++ b/roles/mellanox_drivers/tasks/main.yml
@@ -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