From d1024924bd93f5367e44b5fce4f24ae858d82021 Mon Sep 17 00:00:00 2001 From: logan <2220110150@office.kopo.ac.kr> Date: Tue, 6 May 2025 17:04:07 +0900 Subject: [PATCH 1/4] =?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 | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/README.md b/README.md index 097a7aa..0c6fb2a 100644 --- a/README.md +++ b/README.md @@ -38,14 +38,4 @@ npm start MIT -<<<<<<< HEAD 안녕하세요 그냥 이명일입니다. -======= -## 안녕하세요 - -잘부탁드립니다. - -asdasdadsd -======= -## 한화우승 ->>>>>>> 64f3931 (한화우승) From e9f0c8f7d509f738c75c7208118f6364fd480af7 Mon Sep 17 00:00:00 2001 From: logan <2220110150@office.kopo.ac.kr> Date: Tue, 6 May 2025 18:05:37 +0900 Subject: [PATCH 2/4] test --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index 0c6fb2a..981a17a 100644 --- a/README.md +++ b/README.md @@ -39,3 +39,9 @@ npm start MIT 안녕하세요 그냥 이명일입니다. +======= +## 안녕하세요 + +잘부탁드립니다. + +asdasdadsd From cb0bbfadf5d288c7601ae99734c4cf2946903642 Mon Sep 17 00:00:00 2001 From: logan <2220110150@office.kopo.ac.kr> Date: Tue, 6 May 2025 18:07:22 +0900 Subject: [PATCH 3/4] =?UTF-8?q?=ED=95=9C=ED=99=94=EC=9A=B0=EC=8A=B9?= 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 981a17a..097a7aa 100644 --- a/README.md +++ b/README.md @@ -38,6 +38,7 @@ npm start MIT +<<<<<<< HEAD 안녕하세요 그냥 이명일입니다. ======= ## 안녕하세요 @@ -45,3 +46,6 @@ MIT 잘부탁드립니다. asdasdadsd +======= +## 한화우승 +>>>>>>> 64f3931 (한화우승) From 890507041252919b32ec07c27af05f9696648680 Mon Sep 17 00:00:00 2001 From: logan <2220110150@office.kopo.ac.kr> Date: Tue, 6 May 2025 19:34:52 +0900 Subject: [PATCH 4/4] =?UTF-8?q?=EC=88=98=EC=A0=95=20=EC=9E=91=EC=97=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/README.md b/README.md index 097a7aa..dc523a5 100644 --- a/README.md +++ b/README.md @@ -38,14 +38,5 @@ npm start MIT -<<<<<<< HEAD -안녕하세요 그냥 이명일입니다. -======= -## 안녕하세요 - -잘부탁드립니다. - -asdasdadsd -======= ## 한화우승 ->>>>>>> 64f3931 (한화우승) +