From 3fe5eae837ebe5192e7e786cc685785fc1ddc644 Mon Sep 17 00:00:00 2001
From: JiHwan Kim <pillaret20@ajou.ac.kr>
Date: Wed, 15 Mar 2023 20:16:32 +0900
Subject: [PATCH] added

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

diff --git a/basic-merge.md b/basic-merge.md
index cf438d3..79f9d90 100644
--- a/basic-merge.md
+++ b/basic-merge.md
@@ -1,2 +1,2 @@
 202020526 박지현
-201920815 김지환
+201920815 김지  환
-- 
GitLab