Index: branches/dev/data/Smarty/templates/mobile/shopping/deliv_date.tpl
===================================================================
--- branches/dev/data/Smarty/templates/mobile/shopping/deliv_date.tpl	(revision 11903)
+++ branches/dev/data/Smarty/templates/mobile/shopping/deliv_date.tpl	(revision 11904)
@@ -1,3 +1,2 @@
-<<<<<<< .working
 <!--{*
 /*
@@ -47,4 +46,5 @@
 
 <center><input type="submit" value="¼¡¤Ø"></center>
+<center><input type="submit" name="return" value="Ìá¤ë"></center>
 </form>
 
@@ -60,58 +60,2 @@
 <center>LOCKON CO.,LTD.</center>
 <!-- ¢¥¥Õ¥Ã¥¿¡¼ ¤³¤³¤Þ¤Ç -->
-=======
-<center>ÇÛãÆü»þ»ØÄê</center>
-
-<hr>
-
-<form method="post" action="<!--{$smarty.server.PHP_SELF|escape}-->">
-<input type="hidden" name="mode" value="confirm">
-<input type="hidden" name="uniqid" value="<!--{$tpl_uniqid}-->">
-<input type="hidden" name="payment_id" value="<!--{$arrForm.payment_id.value}-->">
-<!--<input type="hidden" name="message" value="">-->
-<!--{if $tpl_login == 1}-->
-<!--<input type="hidden" name="point_check" value="2">-->
-<!--{/if}-->
-
-¢£ÇÛÁ÷Æü»ØÄê<br>
-<!--{assign var=key value="deliv_date"}-->
-<!--{if $arrErr[$key] != ""}-->
-<font color="red"><!--{$arrErr[$key]}--></font>
-<!--{/if}-->
-<!--{if $arrDelivDate}-->
-<select name="<!--{$key}-->">
-<option value="">»ØÄê¤Ê¤·</option>
-<!--{html_options options=$arrDelivDate selected=$arrForm[$key].value}-->
-</select>
-<!--{else}-->
-¤´»ØÄê失¤Þ¤»¤ó¡£
-<!--{/if}-->
-<br><br>
-
-¢£»þ´ÖÂÓ»ØÄê<br>
-<!--{assign var=key value="deliv_time_id"}-->
-<!--{if $arrErr[$key] != ""}-->
-<font color="red"><!--{$arrErr[$key]}--></font>
-<!--{/if}-->
-<select name="<!--{$key}-->">
-<option value="">»ØÄê¤Ê¤·</option>
-<!--{html_options options=$arrDelivTime selected=$arrForm[$key].value}-->
-</select>
-<br>
-
-<center><input type="submit" value="¼¡¤Ø"></center>
-<center><input type="submit" name="return" value="Ìá¤ë"></center>
-</form>
-
-<br>
-<hr>
-
-<a href="<!--{$smarty.const.URL_CART_TOP}-->" accesskey="9"><!--{9|numeric_emoji}-->¤«¤´¤ò¸«¤ë</a><br>
-<a href="<!--{$smarty.const.URL_SITE_TOP}-->" accesskey="0"><!--{0|numeric_emoji}-->TOP¥Ú¡¼¥¸¤Ø</a><br>
-
-<br>
-
-<!-- ¢§¥Õ¥Ã¥¿¡¼ ¤³¤³¤«¤é -->
-<center>LOCKON CO.,LTD.</center>
-<!-- ¢¥¥Õ¥Ã¥¿¡¼ ¤³¤³¤Þ¤Ç -->
->>>>>>> .merge-right.r11901