From eea1b30c63f185f32b250992f6a3b1d501a7d7ea Mon Sep 17 00:00:00 2001
From: zadkel <45797960+zadkel@users.noreply.github.com>
Date: Tue, 6 May 2025 16:27:44 +0900
Subject: [PATCH 1/2] =?UTF-8?q?Update=20README.md=20=EA=B9=80=EC=99=84?=
 =?UTF-8?q?=EA=B8=B0=20=EC=84=A4=EB=AA=85=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/README.md b/README.md
index 097a7aa..24ca9fc 100644
--- a/README.md
+++ b/README.md
@@ -37,15 +37,3 @@ npm start
 ## 라이선스
 
 MIT
-
-<<<<<<< HEAD
-안녕하세요 그냥 이명일입니다.
-=======
-## 안녕하세요
-
-잘부탁드립니다.
-
-asdasdadsd
-=======
-## 한화우승
->>>>>>> 64f3931 (한화우승)

From 0bdc9c87125a92cbc0e86d53ccd86ba6e0ad4e0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EC=99=84=EA=B8=B0?= <dhksrl215@naver.com>
Date: Tue, 6 May 2025 18:03:09 +0900
Subject: [PATCH 2/2] =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README.md b/README.md
index 24ca9fc..cc5e4eb 100644
--- a/README.md
+++ b/README.md
@@ -37,3 +37,7 @@ npm start
 ## 라이선스
 
 MIT
+
+## 팀원 소개
+김완기:
+안녕하세요 김완기입니다.