merge 충돌 처리

2013-06-13 11:31:56 +09:00
parent c0d2b4ca7d
commit 80c20cc73f
36 changed files with 399 additions and 398 deletions
--- a/adm/poll_list.php
+++ b/adm/poll_list.php
@ -73,7 +73,7 @@ $colspan = 6;
 <section class="cbox">
    <h2>투표목록</h2>

-    <div id="btn_add">
+    <div class="btn_add">
        <a href="./poll_form.php" id="poll_add">투표 추가</a>
    </div>