fix冲突

www/webapp/o2o/js/build/template.js

@@ -1370,7 +1370,7 @@ $out+=' </div> </div> </li> <li class="table-view-cell tip">退款将退至您
 $out+=$escape(order.id);
 $out+='">申请退款</div> </div> </div> </div> </div> </div> ';
 return new String($out);
-});/*v:1*/
+});/*v:5*/
 template('pay/index',function($data,$filename
 /**/) {
 'use strict';var $utils=this,$helpers=$utils.$helpers,showNavBar=$data.showNavBar,$escape=$utils.$escape,orderType=$data.orderType,orderprice=$data.orderprice,chubao=$data.chubao,wxPub=$data.wxPub,showWX=$data.showWX,$out='';if(showNavBar ){