merge 충돌 처리

This commit is contained in:
whitedot committed 2013-06-13 11:31:56 +09:00
1 parent c0d2b4ca7d
commit 80c20cc73f
36 files changed
+399 -398

No files matched your search

+8 -8
View File
@@ -118,26 +118,26 @@ function imageview(id, w, h)
<ul id="qnb">
<?php if(defined('G4_USE_SHOP')) { ?>
<li>
<a href="<?=G4_ADMIN_URL?>/shop_admin/orderlist.php">
<img src="<?=G4_ADMIN_URL?>/shop_admin/img/qnb_sodr.jpg" alt="" width="40" height="40">
<a href="<?php echo G4_ADMIN_URL; ?>/shop_admin/orderlist.php">
<img src="<?php echo G4_ADMIN_URL; ?>/shop_admin/img/qnb_sodr.jpg" alt="" width="40" height="40">
주문관리
</a>
</li>
<li>
<a href="<?=G4_ADMIN_URL?>/shop_admin/itemlist.php">
<img src="<?=G4_ADMIN_URL?>/shop_admin/img/qnb_sit.jpg" alt="" width="40" height="40">
<a href="<?php echo G4_ADMIN_URL; ?>/shop_admin/itemlist.php">
<img src="<?php echo G4_ADMIN_URL; ?>/shop_admin/img/qnb_sit.jpg" alt="" width="40" height="40">
상품관리
</a>
</li>
<li>
<a href="<?=G4_ADMIN_URL?>/shop_admin/itemqalist.php">
<img src="<?=G4_ADMIN_URL?>/shop_admin/img/qnb_sqna.jpg" alt="" width="40" height="40">
<a href="<?php echo G4_ADMIN_URL; ?>/shop_admin/itemqalist.php">
<img src="<?php echo G4_ADMIN_URL; ?>/shop_admin/img/qnb_sqna.jpg" alt="" width="40" height="40">
상품문의
</a>
</li>
<li>
<a href="<?=G4_ADMIN_URL?>/shop_admin/itempslist.php">
<img src="<?=G4_ADMIN_URL?>/shop_admin/img/qnb_sps.jpg" alt="" width="40" height="40">
<a href="<?php echo G4_ADMIN_URL; ?>/shop_admin/itempslist.php">
<img src="<?php echo G4_ADMIN_URL; ?>/shop_admin/img/qnb_sps.jpg" alt="" width="40" height="40">
사용후기
</a>
</li>