From 08ea14eed7e6a9d22a8c77181c155be700b7540e Mon Sep 17 00:00:00 2001
From: kjs <kjs@wace.me>
Date: Thu, 15 Jan 2026 09:31:25 +0900
Subject: [PATCH] =?UTF-8?q?=EC=B6=A9=EB=8F=8C=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/components/screen/config-panels/ButtonConfigPanel.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frontend/components/screen/config-panels/ButtonConfigPanel.tsx b/frontend/components/screen/config-panels/ButtonConfigPanel.tsx
index a1d1d589..66c3890e 100644
--- a/frontend/components/screen/config-panels/ButtonConfigPanel.tsx
+++ b/frontend/components/screen/config-panels/ButtonConfigPanel.tsx
@@ -344,7 +344,6 @@ export const ButtonConfigPanel: React.FC<ButtonConfigPanelProps> = ({
     loadColumns();
   }, [config.action?.dataTransfer?.sourceTable, config.action?.dataTransfer?.targetTable]);
 
-<<<<<<< HEAD
   // 🆕 modal 액션: 대상 화면 테이블 조회 및 필드 매핑 로드
   useEffect(() => {
     const actionType = config.action?.type;