regenerate

OpenAPITools · Jan 15, 2020 · 4ad0ea6 · 4ad0ea6
1 parent 8d86624
commit 4ad0ea6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 13 deletions.
diff --git a/samples/client/petstore/go-experimental/go-petstore/api_fake.go b/samples/client/petstore/go-experimental/go-petstore/api_fake.go
@@ -994,17 +994,11 @@ func (r apiTestEndpointParametersRequest) Callback(callback string) apiTestEndpo
 }
 
 /*
-<<<<<<< HEAD
 TestEndpointParameters Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
-Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
-=======
-TestEndpointParameters Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
 Fake endpoint for testing various parameters
-假端點
-偽のエンドポイント
-가짜 엔드 포인트
-
->>>>>>> [go-experimental] Use builder pattern for requests
+ 假端點
+ 偽のエンドポイント
+ 가짜 엔드 포인트
  * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
 @return apiTestEndpointParametersRequest
 */

diff --git a/samples/client/petstore/go-experimental/go-petstore/docs/FakeApi.md b/samples/client/petstore/go-experimental/go-petstore/docs/FakeApi.md
@@ -338,10 +338,6 @@ No authorization required
 
 Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
 
-<<<<<<< HEAD
-Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
-=======
->>>>>>> [go-experimental] Use builder pattern for requests
 
 
 ### Path Parameters