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:
whitedot
2013-06-13 11:31:56 +09:00
parent c0d2b4ca7d
commit 80c20cc73f
36 changed files with 399 additions and 398 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
adm/admin.menu500.shop_2of2.php
View File

@ -1,4 +1,4 @@
<?
<?php
if (!defined('G4_USE_SHOP') || !G4_USE_SHOP) return;
$menu['menu500'] = array (