From a139818132b44466319b06d2cfec2cfd7c0b2113 Mon Sep 17 00:00:00 2001
From: JiHwan Kim <pillaret20@ajou.ac.kr>
Date: Wed, 15 Mar 2023 20:14:28 +0900
Subject: [PATCH] =?UTF-8?q?201920815=20=EA=B9=80=EC=A7=80=ED=99=98=20added?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 basic-merge.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/basic-merge.md b/basic-merge.md
index 0118176..cf438d3 100644
--- a/basic-merge.md
+++ b/basic-merge.md
@@ -1 +1,2 @@
-202020526 박지현
\ No newline at end of file
+202020526 박지현
+201920815 김지환
-- 
GitLab