merge 충돌 수정

2015-12-10 15:18:54 +09:00
parent d9fe7a3b32 fb3f11a93f
commit 8698c00ac7
3 changed files with 5 additions and 5 deletions
--- a/adm/member_form.php
+++ b/adm/member_form.php
@ -213,7 +213,7 @@ add_javascript(G5_POSTCODE_JS, 0);    //다음 주소 js
        </td>
    </tr>
    <tr>
-        <th scope="row"><label for="mb_zip">주소</label></th>
+        <th scope="row">주소</th>
        <td colspan="3" class="td_addr_line">
            <label for="mb_zip" class="sound_only">우편번호</label>
            <input type="text" name="mb_zip" value="<?php echo $mb['mb_zip1'].$mb['mb_zip2']; ?>" id="mb_zip" class="frm_input readonly" size="5" maxlength="6">