From 0e43c44b470e0f2ae74e8968125501b9025a14da Mon Sep 17 00:00:00 2001
From: bdattoma <bdattoma@redhat.com>
Date: Fri, 10 Jan 2025 12:37:26 +0100
Subject: [PATCH] fix conflict

---
 ods_ci/tasks/Resources/Provisioning/GPU/NFD/nfd_deploy.yaml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/ods_ci/tasks/Resources/Provisioning/GPU/NFD/nfd_deploy.yaml b/ods_ci/tasks/Resources/Provisioning/GPU/NFD/nfd_deploy.yaml
index aaf1408c5..ffa3dd1f9 100644
--- a/ods_ci/tasks/Resources/Provisioning/GPU/NFD/nfd_deploy.yaml
+++ b/ods_ci/tasks/Resources/Provisioning/GPU/NFD/nfd_deploy.yaml
@@ -7,12 +7,8 @@ spec:
   instance: "" # instance is empty by default
   topologyupdater: false # False by default
   operand:
-<<<<<<< HEAD:ods_ci/tasks/Resources/Provisioning/GPU/nfd_deploy.yaml
-    image: registry.redhat.io/openshift4/ose-node-feature-discovery:v4.11
-=======
     # Image URL example: registry.redhat.io/openshift4/ose-node-feature-discovery:v4.11
     image: <imageUrl>
->>>>>>> a0052546 (Update AMD Operator and NFD install scripts (#2139)):ods_ci/tasks/Resources/Provisioning/GPU/NFD/nfd_deploy.yaml
     imagePullPolicy: Always
   workerConfig:
     configData: |