解决冲突

server_api/home-user-auth.api

@@ -13,17 +13,7 @@ service home-user-auth {
 
 	// @handler UserRegisterHandler
 	// post /api/user/register(RequestUserRegister) returns (response);
-<<<<<<< HEAD
 	
-=======
-
-	@handler UserLoginHandler
-	post /api/user/login(RequestUserLogin) returns (response);
-
-	@handler AcceptCookieHandler
-	post /api/user/accept-cookie(request) returns (response);
-
->>>>>>> d843fff73d7ba5d4e14a5d86281d5166f04cb303
 	@handler UserFontsHandler
 	get /api/user/fonts(request) returns (response);
 
@@ -53,17 +43,7 @@ service home-user-auth {
 
 	@handler UserOderDeleteHandler
 	post /api/user/order-delete(RequestOrderId) returns (response);
-<<<<<<< HEAD
 	
-=======
-
-	@handler UserGoogleLoginHandler
-	get /api/user/oauth2/login/google(RequestGoogleLogin) returns (response);
-
-	@handler UserEmailRegisterHandler
-	get /api/user/oauth2/login/register(RequestEmailRegister) returns (response);
-
->>>>>>> d843fff73d7ba5d4e14a5d86281d5166f04cb303
 	//订单列表
 	@handler UserOrderListHandler
 	get /api/user/order-list (UserOrderListReq) returns (response);