사용자: btn_window -> btn_win

2013-01-16 16:07:15 +09:00
parent 62f0395e14
commit 735a1eff60
2 changed files with 1 additions and 7 deletions
--- a/bbs/point.php
+++ b/bbs/point.php
@ -105,7 +105,7 @@ for($i=0; $row=sql_fetch_array($result); $i++) {
        <?=get_paging($config[cf_write_pages], $page, $total_page, $_SERVER[PHP_SELF].'?'.$qstr.'&amp;page=');?>
    </div>

-    <div class="btn_window">
+    <div class="btn_win">
        <a href="javascript:window.close();">창닫기</a>
    </div>
 </div>
--- a/skin/member/neo/memo_form.skin.php
+++ b/skin/member/neo/memo_form.skin.php
@ -35,13 +35,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
    </tbody>
    </table>

-<<<<<<< HEAD
-    <?=captcha_html();?>
-
-    <div class="btn_window btn_confirm">
-=======
    <div class="btn_win">
->>>>>>> 41f59fa9ae589fc22660fde7d19293f195aede31
        <input type="submit" id="btn_submit" class="btn_submit" value="보내기">
        <a href="javascript:window.close();">창닫기</a>
    </div>