diff --git a/constant/url.js b/constant/url.js
index 8c98dab..88240cf 100644
--- a/constant/url.js
+++ b/constant/url.js
@@ -193,17 +193,6 @@ export default {
 	useIntegral: baseUrl+"app/integral.useIntegral",
 	listIntegralUserDetail: baseUrl+"app/integral.listIntegralUserDetail",
 	listReserveGoodsConfirmOrder: baseUrl+"app/reserveOrder.listReserveGoodsConfirmOrder",
-	saveReserveGoodsConfirmOrder: baseUrl+"app/reserveOrder.saveReserveGoodsConfirmOrder",
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
->>>>>>> f0b05be2b2526a8fbb6a0d40eace5e09873e1328
+	saveReserveGoodsConfirmOrder: baseUrl+"app/reserveOrder.saveReserveGoodsConfirmOrder",
 
 }