From d5bccd5f8828eba4a8f181a0b2e0103d6a078648 Mon Sep 17 00:00:00 2001
From: handreas <andreas.hamacher@monash.edu>
Date: Wed, 23 Sep 2020 04:35:30 +0000
Subject: [PATCH] fixing merge conflict

---
 roles/mellanox_drivers/tasks/main.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/roles/mellanox_drivers/tasks/main.yml b/roles/mellanox_drivers/tasks/main.yml
index d2a16b47..7046800e 100644
--- 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
-- 
GitLab