From ed4c115016ec3797e751271bc54f18249223e33e Mon Sep 17 00:00:00 2001
From: thepetk <thepetk@gmail.com>
Date: Tue, 20 Aug 2024 10:07:08 +0100
Subject: [PATCH] Fix conflict

Signed-off-by: thepetk <thepetk@gmail.com>
---
 Makefile | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/Makefile b/Makefile
index a0d6607..e40ec5b 100644
--- a/Makefile
+++ b/Makefile
@@ -63,10 +63,6 @@ endif
 
 # operator-sdk
 OPERATOR_SDK_CLI ?= operator-sdk
-<<<<<<< HEAD
-=======
-
->>>>>>> 682f891 (v0.2.0 (#63))
 
 # Setting SHELL to bash allows bash commands to be executed by recipes.
 # This is a requirement for 'setup-envtest.sh' in the test target.