Index: /branches/dev/data/Smarty/templates/admin/order/mail.tpl
===================================================================
--- /branches/dev/data/Smarty/templates/admin/order/mail.tpl	(revision 14061)
+++ /branches/dev/data/Smarty/templates/admin/order/mail.tpl	(revision 14063)
@@ -89,9 +89,7 @@
 								<select name="template_id" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" onchange="fnModeSubmit('change', '', '');">
 								<option value="" selected="selected">ÁªÂò¤·¤Æ¤¯¤À¤µ¤¤</option>
-<<<<<<< .mine
-								<!--{html_options options=mailTemp selected=$arrForm[$key].value|escape}-->
-=======
+
+
 								<!--{html_options options=$arrMAILTEMPLATE[1] selected=$arrForm[$key].value|escape}-->
->>>>>>> .r13936
 								</select>
 								</td>