merge 충돌 수정

2015-07-20 11:07:33 +09:00
parent e37f5554d2 8da71f60ed
commit 3c9e22a330
8 changed files with 28 additions and 17 deletions
--- a/mobile/skin/board/basic/view.skin.php
+++ b/mobile/skin/board/basic/view.skin.php
@ -65,8 +65,8 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
    <?php } ?>

    <?php
-    if (implode('', $view['link'])) {
-     ?>
+    if ($view['link']) {
+    ?>
    <section id="bo_v_link">
        <h2>관련링크</h2>
        <ul>
--- a/mobile/skin/board/gallery/view.skin.php
+++ b/mobile/skin/board/gallery/view.skin.php
@ -65,8 +65,8 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
    <?php } ?>

    <?php
-    if (implode('', $view['link'])) {
-     ?>
+    if ($view['link']) {
+    ?>
    <section id="bo_v_link">
        <h2>관련링크</h2>
        <ul>