From 3b535adab838764ae990e0e46be0e20bad3f22ee Mon Sep 17 00:00:00 2001
From: gnuboard <kagla@naver.com>
Date: Fri, 28 Dec 2012 17:00:16 +0900
Subject: [PATCH] =?UTF-8?q?=EB=A8=B8=EC=A7=80=20=EC=98=A4=EB=A5=98=20?=
 =?UTF-8?q?=ED=95=B4=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 adm/board_copy_update.php | 64 +++++++++------------------------------
 1 file changed, 14 insertions(+), 50 deletions(-)

diff --git a/adm/board_copy_update.php b/adm/board_copy_update.php
index 1fdca9555..73c6c2130 100644
--- a/adm/board_copy_update.php
+++ b/adm/board_copy_update.php
@@ -31,25 +31,6 @@ $sql = " insert into {$g4['board_table']}
                  bo_subject = '$target_subject',
                  gr_id = '{$board['gr_id']}',
                  bo_admin = '{$board['bo_admin']}',
-<<<<<<< HEAD
-                 bo_list_level = '{$board['bo_list_level']}',
-                 bo_read_level = '{$board['bo_read_level']}',
-                 bo_write_level = '{$board['bo_write_level']}',
-                 bo_reply_level = '{$board['bo_reply_level']}',
-                 bo_comment_level = '{$board['bo_comment_level']}',
-                 bo_upload_level = '{$board['bo_upload_level']}',
-                 bo_download_level = '{$board['bo_download_level']}',
-                 bo_html_level = '{$board['bo_html_level']}',
-                 bo_link_level = '{$board['bo_link_level']}',
-                 bo_trackback_level = '{$board['bo_trackback_level']}',
-                 bo_count_modify = '{$board['bo_count_modify']}',
-                 bo_count_delete = '{$board['bo_count_delete']}',
-                 bo_read_point = '{$board['bo_read_point']}',
-                 bo_write_point = '{$board['bo_write_point']}',
-                 bo_comment_point = '{$board['bo_comment_point']}',
-                 bo_download_point = '{$board['bo_download_point']}',
-                 bo_use_category = '{$board['bo_use_category']}',
-=======
                  bo_list_level = '{$board[bo_list_level]}',
                  bo_read_level = '{$board[bo_read_level]}',
                  bo_write_level = '{$board[bo_write_level]}',
@@ -66,20 +47,8 @@ $sql = " insert into {$g4['board_table']}
                  bo_comment_point = '{$board[bo_comment_point]}',
                  bo_download_point = '{$board[bo_download_point]}',
                  bo_use_category = '{$board[bo_use_category]}',
->>>>>>> 6040266aed7f782fddaf6f63366be5b06bdfa780
                  bo_category_list = '{$board['bo_category_list']}',
                  bo_disable_tags = '{$board['bo_disable_tags']}',
-<<<<<<< HEAD
-                 bo_use_secret = '{$board['bo_use_secret']}',
-                 bo_use_dhtml_editor = '{$board['bo_use_dhtml_editor']}',
-                 bo_use_sideview = '{$board['bo_use_sideview']}',
-                 bo_use_comment = '{$board['bo_use_comment']}',
-                 bo_use_good = '{$board['bo_use_good']}',
-                 bo_use_nogood = '{$board['bo_use_nogood']}',
-                 bo_use_signature = '{$board['bo_use_signature']}',
-                 bo_use_ip_view = '{$board['bo_use_ip_view']}',
-                 bo_use_trackback = '{$board['bo_use_trackback']}',
-=======
                  bo_use_secret = '{$board[bo_use_secret]}',
                  bo_use_dhtml_editor = '{$board[bo_use_dhtml_editor]}',
                  bo_use_sideview = '{$board[bo_use_sideview]}',
@@ -87,33 +56,28 @@ $sql = " insert into {$g4['board_table']}
                  bo_use_nogood = '{$board[bo_use_nogood]}',
                  bo_use_signature = '{$board[bo_use_signature]}',
                  bo_use_ip_view = '{$board[bo_use_ip_view]}',
-<<<<<<< HEAD
-                 bo_use_trackback = '{$board[bo_use_trackback]}',
->>>>>>> 35e2a0e57216e9ff77b98266f30f5e8f87800654
-=======
->>>>>>> 6040266aed7f782fddaf6f63366be5b06bdfa780
                  bo_use_list_view = '{$board['o_use_list_view']}',
-                 bo_use_list_content = '{$board['bo_use_list_content']}',
-                 bo_table_width = '{$board['bo_table_width']}',
-                 bo_subject_len = '{$board['bo_subject_len']}',
-                 bo_page_rows = '{$board['bo_page_rows']}',
-                 bo_new = '{$board['bo_new']}',
-                 bo_hot = '{$board['bo_hot']}',
-                 bo_image_width = '{$board['bo_image_width']}',
+                 bo_use_list_content = '{$board[bo_use_list_content]}',
+                 bo_table_width = '{$board[bo_table_width]}',
+                 bo_subject_len = '{$board[bo_subject_len]}',
+                 bo_page_rows = '{$board[bo_page_rows]}',
+                 bo_new = '{$board[bo_new]}',
+                 bo_hot = '{$board[bo_hot]}',
+                 bo_image_width = '{$board[bo_image_width]}',
                  bo_skin = '{$board['bo_skin']}',
                  bo_include_head = '{$board['bo_include_head']}',
                  bo_include_tail = '{$board['bo_include_tail']}',
                  bo_content_head = '".addslashes($board['bo_content_head'])."',
                  bo_content_tail = '".addslashes($board['bo_content_tail'])."',
                  bo_insert_content = '".addslashes($board['bo_insert_content'])."',
-                 bo_gallery_cols = '{$board['bo_gallery_cols']}',
-                 bo_upload_size = '{$board['bo_upload_size']}',
-                 bo_reply_order = '{$board['bo_reply_order']}',
-                 bo_use_search = '{$board['bo_use_search']}',
-                 bo_order_search = '{$board['bo_order_search']}',
+                 bo_gallery_cols = '{$board[bo_gallery_cols]}',
+                 bo_upload_size = '{$board[bo_upload_size]}',
+                 bo_reply_order = '{$board[bo_reply_order]}',
+                 bo_use_search = '{$board[bo_use_search]}',
+                 bo_order_search = '{$board[bo_order_search]}',
                  bo_notice = '{$board['bo_notice']}',
-                 bo_upload_count = '{$board['bo_upload_count']}',
-                 bo_use_email = '{$board['bo_use_email']}',
+                 bo_upload_count = '{$board[bo_upload_count]}',
+                 bo_use_email = '{$board[bo_use_email]}',
                  bo_sort_field = '{$board['bo_sort_field']}',
                  bo_1_subj = '{$board['bo_1_subj']}',
                  bo_2_subj = '{$board['bo_2_subj']}',