merge 충돌 수정

mobile/shop/mypage.php

@@ -40,8 +40,8 @@ for($k=0; $cp=sql_fetch_array($res); $k++) {
             <dd><?php echo $member['mb_today_login']; ?></dd>
             <dt>회원가입일시</dt>
             <dd><?php echo $member['mb_datetime']; ?></dd>
-            <dt>주소</dt>
-            <dd><?php echo sprintf("(%s-%s)", $member['mb_zip1'], $member['mb_zip2']).' '.print_address($member['mb_addr1'], $member['mb_addr2']); ?></dd>
+            <dt class="ov_addr">주소</dt>
+            <dd class="ov_addr"><?php echo sprintf("(%s-%s)", $member['mb_zip1'], $member['mb_zip2']).' '.print_address($member['mb_addr1'], $member['mb_addr2']); ?></dd>
         </dl>
     </section>