merge 충돌 처리

2013-06-13 11:31:56 +09:00
parent c0d2b4ca7d
commit 80c20cc73f
36 changed files with 399 additions and 398 deletions
--- a/adm/mail_select_list.php
+++ b/adm/mail_select_list.php
@ -108,7 +108,7 @@ include_once('./admin.head.php');
    <?php } ?>
    </tbody>
    </table>
-    <textarea name="ma_list" style="display:none"><?=$ma_list?></textarea>
+    <textarea name="ma_list" style="display:none"><?php echo $ma_list; ?></textarea>
 </div>

 <div class="btn_confirm">