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/mail_list.php
View File

@ -29,7 +29,7 @@ $colspan = 6;
현재 등록된 메일은 총 <?php echo $total_count ?>건입니다.
</p>
<div id="btn_add">
<div class="btn_add">
<a href="./mail_form.php" id="mail_add">메일내용추가</a>
</div>