解决冲突

2 years ago · 54ddeec02d
parent 4e34e194bd
commit 54ddeec02d
1 changed files with 1 additions and 1 deletions
--- a/application/third_party/order/views/gh/confirm_order.php
+++ b/application/third_party/order/views/gh/confirm_order.php
@ -1,3 +1,4 @@
 <!DOCTYPE html>
 <html>
@ -940,4 +941,3 @@ select.gender_pick {border: 1px solid #d1d1d1;
 	</script>
 </body>
 </html>