Changeset 14063

Timestamp:

2007/06/01 11:49:36 (17 years ago)

Author:

nakanishi

Message:

 

File:

• branches/dev/data/Smarty/templates/admin/order/mail.tpl (modified) (1 diff)

branches/dev/data/Smarty/templates/admin/order/mail.tpl

@@ -89 +89 @@
                                 <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>