merge 충돌 처리

2013-06-13 11:31:56 +09:00
parent c0d2b4ca7d
commit 80c20cc73f
36 changed files with 399 additions and 398 deletions
--- a/mobile/shop/navigation1.inc.php
+++ b/mobile/shop/navigation1.inc.php
@ -30,6 +30,6 @@ else
 ?>

 <div id="sct_location">
-    <a href='<?=$g4[path]?>/' class="sct_bg">Home</a>
-    <?=$str?>
+    <a href='<?php echo G4_SHOP_URL; ?>/' class="sct_bg">Home</a>
+    <?php echo $str; ?>
 </div>