From e8963cb1499aaff690661184b7c81b8f828e35dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=ED=95=9C=EC=A7=80=ED=98=81?= <gkswlgur9707@ajou.ac.kr>
Date: Wed, 15 Mar 2023 20:24:21 +0900
Subject: [PATCH] update basic-merge

---
 basic-merge.md | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/basic-merge.md b/basic-merge.md
index 6d9b773..62c846e 100644
--- a/basic-merge.md
+++ b/basic-merge.md
@@ -1,4 +1,3 @@
-<<<<<<< basic-merge.md
-201920803 한지혁
-201920738 정의엽
-201920775 이선제
+###201920803 한지혁
+###201920738 정의엽
+###201920775 이선제
-- 
GitLab