From 7b45e607fb1fd8f1e1a15fae7254be0c23aed0ea Mon Sep 17 00:00:00 2001
From: whitedot <whitedot@naver.com>
Date: Mon, 18 Feb 2013 11:20:21 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90:=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/boardgroup_list.php | 4 ----
 adm/member_list.php     | 4 ----
 adm/poll_list.php       | 3 ---
 3 files changed, 11 deletions(-)

diff --git a/adm/boardgroup_list.php b/adm/boardgroup_list.php
index de47e0545..6102d473b 100644
--- a/adm/boardgroup_list.php
+++ b/adm/boardgroup_list.php
@@ -88,17 +88,13 @@ var list_update_php = "./boardgroup_list_update.php";
         접근사용 옵션은 해당 그룹에 속한 모든 게시판에 적용됩니다.
     </p>
 
-<<<<<<< HEAD
     <?if ($is_admin == 'super') {?>
     <div id="btn_add">
         <a href="./boardgroup_form.php" id="bo_gr_add">게시판그룹 추가</a>
     </div>
     <?}?>
 
-    <form id="fboardgrouplist" name="fboardgrouplist" method="post">
-=======
     <form id="fboardgrouplist" name="fboardgrouplist" method="post" action="./boardgroup_list_update.php">
->>>>>>> 75f31cd998e7ebb2d18eed50b548a4ac81fa39b3
     <input type="hidden" name="sst" value="<?=$sst?>">
     <input type="hidden" name="sod" value="<?=$sod?>">
     <input type="hidden" name="sfl" value="<?=$sfl?>">
diff --git a/adm/member_list.php b/adm/member_list.php
index 59f981167..3594e04cc 100644
--- a/adm/member_list.php
+++ b/adm/member_list.php
@@ -100,17 +100,13 @@ $colspan = 15;
     <h2>회원 목록</h2>
     <p>회원자료 삭제 시 다른 회원이 기존 회원아이디를 사용하지 못하도록 회원아이디, 이름, 별명은 삭제하지 않고 영구 보관합니다.</p>
 
-<<<<<<< HEAD
     <? if ($is_admin == 'super') {?>
     <div id="btn_add">
         <a href="./member_form.php" id="member_add">회원추가</a>
     </div>
     <?}?>
 
-    <form id="fmemberlist" name="fmemberlist" method="post" action="./member_list_update.php" onsubmit="return fmemberlist_submit(this);">
-=======
     <form id="fmemberlist" name="fmemberlist" method="post" action="./member_list_update.php">
->>>>>>> 6ed598e865fecf9bd14c8d69b500f5d2b05a1046
     <input type="hidden" name="sst" value="<?=$sst?>">
     <input type="hidden" name="sod" value="<?=$sod?>">
     <input type="hidden" name="sfl" value="<?=$sfl?>">
diff --git a/adm/poll_list.php b/adm/poll_list.php
index c3aac8606..a3dc7b38f 100644
--- a/adm/poll_list.php
+++ b/adm/poll_list.php
@@ -72,12 +72,10 @@ $colspan = 6;
 <section class="cbox">
     <h2>투표목록</h2>
 
-<<<<<<< HEAD
     <div id="btn_add">
         <a href="./poll_form.php" id="poll_add">투표 추가</a>
     </div>
 
-=======
     <form id="fpolllist" name="fpolllist" method="post" action="./poll_delete.php">
     <input type="hidden" name="sst" value="<?=$sst?>">
     <input type="hidden" name="sod" value="<?=$sod?>">
@@ -85,7 +83,6 @@ $colspan = 6;
     <input type="hidden" name="stx" value="<?=$stx?>">
     <input type="hidden" name="page" value="<?=$page?>">
     <input type="hidden" name="token" value="<?=$token?>">
->>>>>>> 75f31cd998e7ebb2d18eed50b548a4ac81fa39b3
     <table>
     <thead>
     <tr>