merge 충돌 처리

2013-06-13 11:31:56 +09:00
parent c0d2b4ca7d
commit 80c20cc73f
36 changed files with 399 additions and 398 deletions
--- a/shop/list.php
+++ b/shop/list.php
@ -48,7 +48,7 @@ if ($is_admin)

 <div id="sct">

-    <?
+    <?php
    $nav_ca_id = $ca_id;
    include G4_SHOP_PATH.'/navigation1.inc.php';