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-02-15 15:58:49 +09:00
parent 30ac80b29a 92b4c6cc87
commit 9710ac8f1a
20 changed files with 183 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
adm/mail_select_list.php
View File

@ -97,11 +97,11 @@ while ($row=sql_fetch_array($result))
$cr = "\n";
?>
<tr>
<td><?=$i?></td>
<td><?=$row['mb_id']?></td>
<td><?=$row['mb_name']?></td>
<td><?=$row['mb_nick']?></td>
<td><?=$row['mb_birth']?></td>
<td class="td_num"><?=$i?></td>
<td class="td_mbid"><?=$row['mb_id']?></td>
<td class="td_mbname"><?=$row['mb_name']?></td>
<td class="td_mbnick"><?=$row['mb_nick']?></td>
<td class="td_time"><?=$row['mb_birth']?></td>
<td><?=$row['mb_email']?></td>
</tr>
<?}?>