From 714f00e278343c7f46f83d2d5e3cc7658e73e697 Mon Sep 17 00:00:00 2001
From: miteruzo <miteruzo@naver.com>
Date: Sun, 24 Aug 2025 05:55:59 +0900
Subject: [PATCH] =?UTF-8?q?=E3=82=A8=E3=83=A9=E3=83=BC=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/common/Form.tsx | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/frontend/src/components/common/Form.tsx b/frontend/src/components/common/Form.tsx
index 991950a..eb6ea67 100644
--- a/frontend/src/components/common/Form.tsx
+++ b/frontend/src/components/common/Form.tsx
@@ -1,13 +1,6 @@
-import type { ReactNode } from 'react'
-
-<<<<<<< Updated upstream
-import type { FC } from 'react'
-
-type Props = { children: React.ReactNode }
-=======
+import type { FC, ReactNode } from 'react'
 
 type Props = { children: ReactNode }
->>>>>>> Stashed changes
 
 
 export default (({ children }: Props) => (