loafle/openapi-generator-original
3
0
Fork 1
mirror of https://github.com/OpenAPITools/openapi-generator.git synced 2025-07-03 14:10:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

resolve merge conflicts in VERSION files

Browse Source
This commit is contained in:
William Cheng 2020-01-20 18:05:23 +08:00
parent 4ec3900d31
commit bbada4fe7c
2 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
samples/client/petstore/csharp/OpenAPIClientNetStandard/.openapi-generator/VERSION
View File

@ -1,5 +1 @@
<<<<<<< HEAD
5.0.0-SNAPSHOT 5.0.0-SNAPSHOT
=======
4.2.3-SNAPSHOT
>>>>>>> origin/4.3.x

4
samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/.openapi-generator/VERSION
View File

@ -1,5 +1 @@
<<<<<<< HEAD
5.0.0-SNAPSHOT 5.0.0-SNAPSHOT
=======
4.2.3-SNAPSHOT
>>>>>>> origin/4.3.x