From 1fc95b0cab759885617028fc3e0a37e4cdaf2959 Mon Sep 17 00:00:00 2001
From: whitedot <whitedot@naver.com>
Date: Mon, 18 Feb 2013 13:41:46 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90:=20merge?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 adm/board_list.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/adm/board_list.php b/adm/board_list.php
index 30a797727..19045b73a 100644
--- a/adm/board_list.php
+++ b/adm/board_list.php
@@ -86,17 +86,13 @@ $colspan = 8;
     <h2>생성된 게시판 목록</h2>
     <p>여러개의 게시판 설정을 한번에 바꾸실 때는 게시판 체크기능을 이용하세요.</p>
 
-<<<<<<< HEAD
     <?if ($is_admin == 'super') {?>
     <div id="btn_add">
         <a href="./board_form.php" id="bo_add">게시판 추가</a>
     </div>
     <?}?>
 
-    <form id="fboardlist" name="fboardlist" method="post" action="./board_list_update.php" onsubmit="return fboardlist_submit(this);">
-=======
     <form id="fboardlist" name="fboardlist" method="post" action="./board_list_update.php">
->>>>>>> 6351d0732dbb9a7896c228d552d98ba457ee7b4f
     <input type="hidden" name="sst" value="<?=$sst?>">
     <input type="hidden" name="sod" value="<?=$sod?>">
     <input type="hidden" name="sfl" value="<?=$sfl?>">