충돌수정

2026-01-15 09:31:25 +09:00 · 2026-01-15 09:31:25 +09:00 · 08ea14eed7
parent 45f0c667c2
commit 08ea14eed7
1 changed files with 0 additions and 1 deletions
--- 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;