From dfd8582320fca1a8d9469ae7d04639d6895bec99 Mon Sep 17 00:00:00 2001
From: Derek Ho <dxho@amazon.com>
Date: Thu, 27 Apr 2023 15:39:40 -0400
Subject: [PATCH] finish merge

Signed-off-by: Derek Ho <dxho@amazon.com>
---
 .../custom_panels/custom_panel_view_so.tsx      | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/public/components/custom_panels/custom_panel_view_so.tsx b/public/components/custom_panels/custom_panel_view_so.tsx
index 83d8ab55e9..297d0219a6 100644
--- a/public/components/custom_panels/custom_panel_view_so.tsx
+++ b/public/components/custom_panels/custom_panel_view_so.tsx
@@ -258,27 +258,10 @@ export const CustomPanelViewSO = (props: CustomPanelViewProps) => {
   };
 
   // toggle between panel edit mode
-<<<<<<< HEAD
   const editPanel = (editType: string) => {
     setIsEditing(!isEditing);
     if (editType === 'cancel') dispatch(fetchPanel(panelId));
     setEditActionType(editType);
-=======
-
-  const startEdit = () => {
-    setIsEditing(true);
-  };
-
-  const applyEdits = useCallback(() => {
-    dispatch(updatePanel(panel, '', ''));
-    setIsEditing(false);
-    setEditActionType('save');
-  }, [panel]);
-
-  const cancelEdit = () => {
-    dispatch(fetchPanel(panelId));
-    setIsEditing(false);
->>>>>>> 22977feb (code cleanup)
   };
 
   const closeFlyout = () => {