firstgarden/firstgarden-web-gnu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

merge 충돌 수정

Browse Source
This commit is contained in:
chicpro
2013-05-06 13:12:06 +09:00
parent a9e551e754
commit c9487d48d1
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
shop/item.php
View File

@ -132,7 +132,6 @@ $row = sql_fetch($sql);
$item_relation_count = $row['cnt']; $item_relation_count = $row['cnt'];
?> ?>
<<<<<<< HEAD
<?php <?php
function pg_anchor($anc_id) { function pg_anchor($anc_id) {
global $default; global $default;
@ -147,9 +146,6 @@ function pg_anchor($anc_id) {
</ul> </ul>
<?php } ?> <?php } ?>
<script src="<?php echo G4_JS_URL; ?>/shop.js"></script>
=======
>>>>>>> e996e707806fc6f359cb4e91fb92d84e4386e022
<script src="<?php echo G4_JS_URL; ?>/md5.js"></script> <script src="<?php echo G4_JS_URL; ?>/md5.js"></script>
<?php <?php