Changeset 13978

Timestamp:

2007/05/31 21:03:33 (17 years ago)

Author:

matsumoto

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>