From 0ee7b54e5ba57a24c337e3a335dc07eddd342402 Mon Sep 17 00:00:00 2001
From: whitedot <whitedot@naver.com>
Date: Mon, 18 Feb 2013 10:59:41 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90:=20=ED=9A=8C?=
 =?UTF-8?q?=EC=9B=90=EB=A9=94=EC=9D=BC=EB=B0=9C=EC=86=A1=20merge=20?=
 =?UTF-8?q?=EC=B6=A9=EB=8F=8C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 adm/mail_list.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/adm/mail_list.php b/adm/mail_list.php
index 1960bfe6f..e9b030825 100644
--- a/adm/mail_list.php
+++ b/adm/mail_list.php
@@ -29,14 +29,11 @@ $colspan = 6;
         현재 등록된 메일은 총 <?=$total_count ?>건입니다.
     </p>
 
-<<<<<<< HEAD
     <div id="btn_add">
         <a href="./mail_form.php" id="mail_add">메일내용추가</a>
     </div>
 
-=======
     <form id="fmaillist" name="fmaillist" method="post" action="./mail_delete.php">
->>>>>>> 75f31cd998e7ebb2d18eed50b548a4ac81fa39b3
     <table>
     <thead>
     <tr>