merge 충돌

2013-10-14 15:08:34 +09:00
parent c39eb7f019 cfd8db6b9e
commit 51938f0a2b
54 changed files with 4210 additions and 3191 deletions
--- a/skin/member/basic/img/reg_result_logo.jpg
+++ b/skin/member/basic/img/reg_result_logo.jpg
--- a/skin/member/basic/style.css
+++ b/skin/member/basic/style.css
@ -59,7 +59,9 @@

 .mbskin .frm_info {}

-.mbskin .required {} /* 필수입력 */
+/* 필수입력 */
+.mbskin .required {}
+.mbskin textarea.required {}

 /* 테이블 항목별 정의 */
 .mbskin .td_board {}