From 46ed765c940adf429602279a4bd539385323b40d Mon Sep 17 00:00:00 2001
From: ty2622 <ty2622@likelion.org>
Date: Wed, 5 Apr 2023 18:39:55 +0900
Subject: [PATCH] =?UTF-8?q?docs=20:=20=EC=9D=B4=EB=A6=84=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 members/LeeTaeyeon.html | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/members/LeeTaeyeon.html b/members/LeeTaeyeon.html
index d714dba..a430914 100644
--- a/members/LeeTaeyeon.html
+++ b/members/LeeTaeyeon.html
@@ -21,19 +21,11 @@
       <div class="introduce_text">
         <div class="introduce_title">
           Hi, I am<br />
-<<<<<<< HEAD
-          바보 이태연
-=======
           Lee TaeYeon
->>>>>>> 74ee0b3 (feat-이름수정)
         </div>
         <div class="introduce_subTitle">
-<<<<<<< HEAD
           <!-- 자신의 트랙을 써주세요 예) Frontend developer -->
           개발
-=======
-          <!-- developer -->
->>>>>>> 5c291aeac4f754a5fc43b49c968d8ad7f5581022
         </div>
         <!-- 선택사항입니다. 주소에 자신의 깃허브 주소, 인스타그램 주소를 window.open 부분에 적으시면 됩니다. 인스타가 없으시다면 버튼태그를 지우시면 됩니다.-->
         <button
@@ -57,12 +49,8 @@
       <div class="main_title">About</div>
       <div class="main_text">
         <!-- 자기 소개 글을 써주세요 -->
-<<<<<<< HEAD
-        <p>안녕하세요</p>
+        <p>안녕하세요 이태연입니다.</p>
       </div>
-=======
-      </div>안녕하세요
->>>>>>> 74ee0b3 (feat-이름수정)
       <div class="main_info">
         <div class="main_info_content">
           <div class="big-circle"><div class="small-circle"></div></div>
@@ -70,6 +58,7 @@
             <div class="main_info_title">Full name</div>
             <div>
               <!-- 이름을 써주세요 -->
+              이태연
             </div>
           </div>
         </div>
@@ -79,6 +68,7 @@
             <div class="main_info_title">Email Address</div>
             <div>
               <!-- 이메일 주소를 써주세요 -->
+                ty2622@naver.com
             </div>
           </div>
         </div>