From 8c2ce3f209b0bb24f3e9bc22614db311cf4fc869 Mon Sep 17 00:00:00 2001
From: Cristhian Zanforlin Lousa <cristhian.lousa@gmail.com>
Date: Tue, 1 Aug 2023 20:21:06 -0300
Subject: [PATCH] =?UTF-8?q?=F0=9F=94=80=20merge(frontend):=20resolve=20mer?=
 =?UTF-8?q?ge=20conflict=20in=20reactflowUtils.ts=20file=20=F0=9F=90=9B=20?=
 =?UTF-8?q?fix(frontend):=20remove=20unnecessary=20merge=20conflict=20mark?=
 =?UTF-8?q?ers=20in=20reactflowUtils.ts=20file?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/frontend/src/utils/reactflowUtils.ts | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/frontend/src/utils/reactflowUtils.ts b/src/frontend/src/utils/reactflowUtils.ts
index 5b4fbac09..29040fd0d 100644
--- a/src/frontend/src/utils/reactflowUtils.ts
+++ b/src/frontend/src/utils/reactflowUtils.ts
@@ -232,8 +232,6 @@ export function addVersionToDuplicates(flow: FlowType, flows: FlowType[]) {
 
   return newName;
 }
-<<<<<<< HEAD
-=======
 
 export function handleKeyDown(e: React.KeyboardEvent<HTMLInputElement>, inputValue: string | string[] | null, block: string)
 {
@@ -242,4 +240,3 @@ export function handleKeyDown(e: React.KeyboardEvent<HTMLInputElement>, inputVal
     e.stopPropagation();
   }
 };
->>>>>>> bugfix-backctrl