merge 충돌 수정

2013-10-14 17:28:13 +09:00
parent f2a5866c52 6f5803bb3c
commit 0fbb63a64c
79 changed files with 704 additions and 184 deletions
--- a/mobile/skin/member/basic/style.css
+++ b/mobile/skin/member/basic/style.css
@ -86,7 +86,6 @@
 /* 회원가입 입력 */
 #fregisterform #reg_mb_email, #fregisterform .frm_address {width:100%}
 #fregisterform textarea {width:100%;height:50px}
-
 /* 회원가입 완료 */
 #reg_result {padding:4em 1em 0}
 #reg_result_logo {margin-bottom:50px;text-align:center}