From bbada4fe7cfa45c980e1862f24141b6eed2a2a0e Mon Sep 17 00:00:00 2001 From: William Cheng Date: Mon, 20 Jan 2020 18:05:23 +0800 Subject: [PATCH] resolve merge conflicts in VERSION files --- .../OpenAPIClientNetStandard/.openapi-generator/VERSION | 4 ---- .../.openapi-generator/VERSION | 4 ---- 2 files changed, 8 deletions(-) diff --git a/samples/client/petstore/csharp/OpenAPIClientNetStandard/.openapi-generator/VERSION b/samples/client/petstore/csharp/OpenAPIClientNetStandard/.openapi-generator/VERSION index 332e1875af2..71d2eb1c7fc 100644 --- a/samples/client/petstore/csharp/OpenAPIClientNetStandard/.openapi-generator/VERSION +++ b/samples/client/petstore/csharp/OpenAPIClientNetStandard/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD 5.0.0-SNAPSHOT -======= -4.2.3-SNAPSHOT ->>>>>>> origin/4.3.x diff --git a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/.openapi-generator/VERSION b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/.openapi-generator/VERSION index 332e1875af2..71d2eb1c7fc 100644 --- a/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/.openapi-generator/VERSION +++ b/samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD 5.0.0-SNAPSHOT -======= -4.2.3-SNAPSHOT ->>>>>>> origin/4.3.x