From e1d61123cb86a8faa40aff3251420bace86e22f6 Mon Sep 17 00:00:00 2001
From: SangYoonLee <prestro1231@hufs.ac.kr>
Date: Thu, 30 Mar 2023 20:57:50 +0900
Subject: [PATCH 1/2] =?UTF-8?q?Modify:=20=EC=9D=B4=EB=A6=84=20=EC=98=81?=
 =?UTF-8?q?=EC=96=B4=EB=A1=9C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 members/LeeSangyun.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/members/LeeSangyun.html b/members/LeeSangyun.html
index c2bcd30..bf1d34a 100644
--- a/members/LeeSangyun.html
+++ b/members/LeeSangyun.html
@@ -21,7 +21,7 @@
       <div class="introduce_text">
         <div class="introduce_title">
           Hi, I am<br />
-          이상윤
+          Lee Sang Yoon
         </div>
         <div class="introduce_subTitle">Frontend developer</div>
         <!-- 선택사항입니다. 주소에 자신의 깃허브 주소, 인스타그램 주소를 window.open 부분에 적으시면 됩니다. 인스타가 없으시다면 버튼태그를 지우시면 됩니다.-->

From 82713fb8e09bbe88bff2278ccda3656a376f5190 Mon Sep 17 00:00:00 2001
From: SangYoonLee <prestro1231@hufs.ac.kr>
Date: Thu, 30 Mar 2023 23:22:28 +0900
Subject: [PATCH 2/2] =?UTF-8?q?Fix:=20=EC=B6=A9=EB=8F=8C=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 members/LeeSangyun.html | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/members/LeeSangyun.html b/members/LeeSangyun.html
index 7792dae..bf1d34a 100644
--- a/members/LeeSangyun.html
+++ b/members/LeeSangyun.html
@@ -21,11 +21,7 @@
       <div class="introduce_text">
         <div class="introduce_title">
           Hi, I am<br />
-<<<<<<< HEAD
           Lee Sang Yoon
-=======
-          바보 이상윤
->>>>>>> main
         </div>
         <div class="introduce_subTitle">Frontend developer</div>
         <!-- 선택사항입니다. 주소에 자신의 깃허브 주소, 인스타그램 주소를 window.open 부분에 적으시면 됩니다. 인스타가 없으시다면 버튼태그를 지우시면 됩니다.-->