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

사용후기부분 충돌 코드 수정

Browse Source
This commit is contained in:
chicpro
2013-06-14 17:22:28 +09:00
parent d37d3e0a30
commit 2a51368e0e
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
adm/shop_admin/index.php
View File

@ -158,11 +158,7 @@ $pg_anchor = '<ul class="anchor">
</thead> </thead>
<tbody> <tbody>
<?php <?php
<<<<<<< HEAD
$sql = " select * from {$g4[shop_item_use_table]} $sql = " select * from {$g4[shop_item_use_table]}
=======
$sql = " select * from {$g4['shop_item_ps_table']}
>>>>>>> master
where is_confirm = 0 where is_confirm = 0
order by is_id desc order by is_id desc
limit $max_limit "; limit $max_limit ";
@ -177,11 +173,7 @@ $pg_anchor = '<ul class="anchor">
<tr> <tr>
<td class="td_name"><?php echo $name; ?></td> <td class="td_name"><?php echo $name; ?></td>
<td><?php echo cut_str($row['is_subject'],40); ?></td> <td><?php echo cut_str($row['is_subject'],40); ?></td>
<<<<<<< HEAD
<td class="td_smallmng"><a href="./itemuseform.php?w=u&amp;is_id=<?php echo $row['is_id']; ?>"><img src="./img/icon_mod.jpg" alt="<?php cut_str($row['is_subject'],40); ?> 수정"></a></td> <td class="td_smallmng"><a href="./itemuseform.php?w=u&amp;is_id=<?php echo $row['is_id']; ?>"><img src="./img/icon_mod.jpg" alt="<?php cut_str($row['is_subject'],40); ?> 수정"></a></td>
=======
<td class="td_smallmng"><a href="./itempsform.php?w=u&amp;is_id=<?php echo $row['is_id']; ?>">수정</a></td>
>>>>>>> master
</tr> </tr>
<?php <?php
} }