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-02-18 10:59:41 +09:00
parent 5c313f82ad
commit 0ee7b54e5b
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
adm/mail_list.php
View File

@ -29,14 +29,11 @@ $colspan = 6;
현재 등록된 메일은 총 <?=$total_count ?>건입니다. 현재 등록된 메일은 총 <?=$total_count ?>건입니다.
</p> </p>
<<<<<<< HEAD
<div id="btn_add"> <div id="btn_add">
<a href="./mail_form.php" id="mail_add">메일내용추가</a> <a href="./mail_form.php" id="mail_add">메일내용추가</a>
</div> </div>
=======
<form id="fmaillist" name="fmaillist" method="post" action="./mail_delete.php"> <form id="fmaillist" name="fmaillist" method="post" action="./mail_delete.php">
>>>>>>> 75f31cd998e7ebb2d18eed50b548a4ac81fa39b3
<table> <table>
<thead> <thead>
<tr> <tr>