From 05e4c3cf641b353cac40f69cd48d9d9dcbf83197 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Mon, 12 Jul 2021 17:15:22 +0800 Subject: [PATCH] update samples --- samples/client/petstore/R/.openapi-generator/VERSION | 6 +----- samples/client/petstore/apex/.openapi-generator/VERSION | 6 +----- samples/client/petstore/bash/.openapi-generator/VERSION | 6 +----- samples/client/petstore/c/.openapi-generator/VERSION | 6 +----- samples/client/petstore/cpp-qt/.openapi-generator/VERSION | 2 +- .../petstore/cpp-restsdk/client/.openapi-generator/VERSION | 6 +----- samples/client/petstore/cpp-restsdk/client/ApiClient.cpp | 4 ---- samples/client/petstore/cpp-restsdk/client/ApiClient.h | 4 ---- .../client/petstore/cpp-restsdk/client/ApiConfiguration.cpp | 4 ---- .../client/petstore/cpp-restsdk/client/ApiConfiguration.h | 4 ---- samples/client/petstore/cpp-restsdk/client/ApiException.cpp | 4 ---- samples/client/petstore/cpp-restsdk/client/ApiException.h | 4 ---- samples/client/petstore/cpp-restsdk/client/HttpContent.cpp | 4 ---- samples/client/petstore/cpp-restsdk/client/HttpContent.h | 4 ---- samples/client/petstore/cpp-restsdk/client/IHttpBody.h | 4 ---- samples/client/petstore/cpp-restsdk/client/JsonBody.cpp | 4 ---- samples/client/petstore/cpp-restsdk/client/JsonBody.h | 4 ---- samples/client/petstore/cpp-restsdk/client/ModelBase.cpp | 4 ---- samples/client/petstore/cpp-restsdk/client/ModelBase.h | 4 ---- .../petstore/cpp-restsdk/client/MultipartFormData.cpp | 4 ---- .../client/petstore/cpp-restsdk/client/MultipartFormData.h | 4 ---- samples/client/petstore/cpp-restsdk/client/Object.cpp | 4 ---- samples/client/petstore/cpp-restsdk/client/Object.h | 4 ---- samples/client/petstore/cpp-restsdk/client/api/PetApi.cpp | 4 ---- samples/client/petstore/cpp-restsdk/client/api/PetApi.h | 4 ---- samples/client/petstore/cpp-restsdk/client/api/StoreApi.cpp | 4 ---- samples/client/petstore/cpp-restsdk/client/api/StoreApi.h | 4 ---- samples/client/petstore/cpp-restsdk/client/api/UserApi.cpp | 4 ---- samples/client/petstore/cpp-restsdk/client/api/UserApi.h | 4 ---- .../petstore/cpp-restsdk/client/model/ApiResponse.cpp | 4 ---- .../client/petstore/cpp-restsdk/client/model/ApiResponse.h | 4 ---- .../client/petstore/cpp-restsdk/client/model/Category.cpp | 4 ---- samples/client/petstore/cpp-restsdk/client/model/Category.h | 4 ---- samples/client/petstore/cpp-restsdk/client/model/Order.cpp | 4 ---- samples/client/petstore/cpp-restsdk/client/model/Order.h | 4 ---- samples/client/petstore/cpp-restsdk/client/model/Pet.cpp | 4 ---- samples/client/petstore/cpp-restsdk/client/model/Pet.h | 4 ---- samples/client/petstore/cpp-restsdk/client/model/Tag.cpp | 4 ---- samples/client/petstore/cpp-restsdk/client/model/Tag.h | 4 ---- samples/client/petstore/cpp-restsdk/client/model/User.cpp | 4 ---- samples/client/petstore/cpp-restsdk/client/model/User.h | 4 ---- samples/client/petstore/cpp-tiny/.openapi-generator/VERSION | 2 +- samples/client/petstore/crystal/.openapi-generator/VERSION | 6 +----- samples/client/petstore/crystal/.travis.yml | 4 ---- samples/client/petstore/crystal/spec/spec_helper.cr | 4 ---- samples/client/petstore/crystal/src/petstore.cr | 4 ---- samples/client/petstore/crystal/src/petstore/api/pet_api.cr | 4 ---- .../client/petstore/crystal/src/petstore/api/store_api.cr | 4 ---- .../client/petstore/crystal/src/petstore/api/user_api.cr | 4 ---- samples/client/petstore/crystal/src/petstore/api_client.cr | 4 ---- samples/client/petstore/crystal/src/petstore/api_error.cr | 4 ---- .../client/petstore/crystal/src/petstore/configuration.cr | 4 ---- .../petstore/crystal/src/petstore/models/api_response.cr | 4 ---- .../client/petstore/crystal/src/petstore/models/category.cr | 4 ---- .../client/petstore/crystal/src/petstore/models/order.cr | 4 ---- samples/client/petstore/crystal/src/petstore/models/pet.cr | 4 ---- samples/client/petstore/crystal/src/petstore/models/tag.cr | 4 ---- samples/client/petstore/crystal/src/petstore/models/user.cr | 4 ---- .../.openapi-generator/VERSION | 2 +- .../OpenAPIClient-httpclient/.openapi-generator/VERSION | 6 +----- .../OpenAPIClient-net47/.openapi-generator/VERSION | 6 +----- .../OpenAPIClient-net5.0/.openapi-generator/VERSION | 6 +----- .../csharp-netcore/OpenAPIClient/.openapi-generator/VERSION | 6 +----- .../OpenAPIClientCore/.openapi-generator/VERSION | 6 +----- .../OpenAPIClientCoreAndNet47/.openapi-generator/VERSION | 6 +----- .../csharp/OpenAPIClient/.openapi-generator/VERSION | 6 +----- samples/client/petstore/elixir/.openapi-generator/VERSION | 6 +----- .../petstore/go/go-petstore/.openapi-generator/VERSION | 6 +----- samples/client/petstore/groovy/.openapi-generator/VERSION | 6 +----- .../petstore/haskell-http-client/.openapi-generator/VERSION | 6 +----- .../java/feign-no-nullable/.openapi-generator/VERSION | 6 +----- .../client/petstore/java/feign/.openapi-generator/VERSION | 6 +----- .../java/google-api-client/.openapi-generator/VERSION | 6 +----- .../client/petstore/java/jersey1/.openapi-generator/VERSION | 6 +----- .../jersey2-java8-localdatetime/.openapi-generator/VERSION | 6 +----- .../petstore/java/jersey2-java8/.openapi-generator/VERSION | 6 +----- .../microprofile-rest-client/.openapi-generator/VERSION | 6 +----- .../petstore/java/native-async/.openapi-generator/VERSION | 6 +----- .../client/petstore/java/native/.openapi-generator/VERSION | 6 +----- .../.openapi-generator/VERSION | 6 +----- .../okhttp-gson-parcelableModel/.openapi-generator/VERSION | 6 +----- .../petstore/java/okhttp-gson/.openapi-generator/VERSION | 6 +----- .../java/rest-assured-jackson/.openapi-generator/VERSION | 6 +----- .../petstore/java/rest-assured/.openapi-generator/VERSION | 6 +----- .../petstore/java/resteasy/.openapi-generator/VERSION | 6 +----- .../java/resttemplate-withXml/.openapi-generator/VERSION | 6 +----- .../petstore/java/resttemplate/.openapi-generator/VERSION | 6 +----- .../java/retrofit2-play26/.openapi-generator/VERSION | 6 +----- .../petstore/java/retrofit2/.openapi-generator/VERSION | 6 +----- .../petstore/java/retrofit2rx2/.openapi-generator/VERSION | 6 +----- .../petstore/java/retrofit2rx3/.openapi-generator/VERSION | 6 +----- .../java/vertx-no-nullable/.openapi-generator/VERSION | 6 +----- .../client/petstore/java/vertx/.openapi-generator/VERSION | 6 +----- .../petstore/java/webclient/.openapi-generator/VERSION | 6 +----- .../petstore/javascript-es6/.openapi-generator/VERSION | 6 +----- .../javascript-promise-es6/.openapi-generator/VERSION | 6 +----- .../client/petstore/kotlin-gson/.openapi-generator/VERSION | 6 +----- .../petstore/kotlin-jackson/.openapi-generator/VERSION | 6 +----- .../kotlin-json-request-string/.openapi-generator/VERSION | 6 +----- .../.openapi-generator/VERSION | 6 +----- .../kotlin-moshi-codegen/.openapi-generator/VERSION | 6 +----- .../kotlin-multiplatform/.openapi-generator/VERSION | 6 +----- .../petstore/kotlin-nonpublic/.openapi-generator/VERSION | 6 +----- .../petstore/kotlin-nullable/.openapi-generator/VERSION | 6 +----- .../petstore/kotlin-okhttp3/.openapi-generator/VERSION | 6 +----- .../.openapi-generator/VERSION | 6 +----- .../kotlin-retrofit2-rx3/.openapi-generator/VERSION | 6 +----- .../petstore/kotlin-retrofit2/.openapi-generator/VERSION | 6 +----- .../petstore/kotlin-string/.openapi-generator/VERSION | 6 +----- .../petstore/kotlin-threetenbp/.openapi-generator/VERSION | 6 +----- .../kotlin-uppercase-enum/.openapi-generator/VERSION | 6 +----- samples/client/petstore/kotlin/.openapi-generator/VERSION | 6 +----- samples/client/petstore/lua/.openapi-generator/VERSION | 6 +----- samples/client/petstore/nim/.openapi-generator/VERSION | 6 +----- .../petstore/objc/core-data/.openapi-generator/VERSION | 6 +----- .../client/petstore/objc/default/.openapi-generator/VERSION | 6 +----- samples/client/petstore/perl/.openapi-generator/VERSION | 6 +----- .../php/OpenAPIClient-php/.openapi-generator/VERSION | 6 +----- .../php/OpenAPIClient-php/lib/Api/AnotherFakeApi.php | 4 ---- .../petstore/php/OpenAPIClient-php/lib/Api/DefaultApi.php | 4 ---- .../petstore/php/OpenAPIClient-php/lib/Api/FakeApi.php | 4 ---- .../OpenAPIClient-php/lib/Api/FakeClassnameTags123Api.php | 4 ---- .../petstore/php/OpenAPIClient-php/lib/Api/PetApi.php | 4 ---- .../petstore/php/OpenAPIClient-php/lib/Api/StoreApi.php | 4 ---- .../petstore/php/OpenAPIClient-php/lib/Api/UserApi.php | 4 ---- .../petstore/php/OpenAPIClient-php/lib/ApiException.php | 4 ---- .../petstore/php/OpenAPIClient-php/lib/Configuration.php | 4 ---- .../petstore/php/OpenAPIClient-php/lib/HeaderSelector.php | 4 ---- .../lib/Model/AdditionalPropertiesClass.php | 4 ---- .../petstore/php/OpenAPIClient-php/lib/Model/Animal.php | 4 ---- .../php/OpenAPIClient-php/lib/Model/ApiResponse.php | 4 ---- .../lib/Model/ArrayOfArrayOfNumberOnly.php | 4 ---- .../php/OpenAPIClient-php/lib/Model/ArrayOfNumberOnly.php | 4 ---- .../petstore/php/OpenAPIClient-php/lib/Model/ArrayTest.php | 4 ---- .../php/OpenAPIClient-php/lib/Model/Capitalization.php | 4 ---- .../client/petstore/php/OpenAPIClient-php/lib/Model/Cat.php | 4 ---- .../petstore/php/OpenAPIClient-php/lib/Model/CatAllOf.php | 4 ---- .../petstore/php/OpenAPIClient-php/lib/Model/Category.php | 4 ---- .../petstore/php/OpenAPIClient-php/lib/Model/ClassModel.php | 4 ---- .../petstore/php/OpenAPIClient-php/lib/Model/Client.php | 4 ---- .../client/petstore/php/OpenAPIClient-php/lib/Model/Dog.php | 4 ---- .../petstore/php/OpenAPIClient-php/lib/Model/DogAllOf.php | 4 ---- .../petstore/php/OpenAPIClient-php/lib/Model/EnumArrays.php | 4 ---- .../petstore/php/OpenAPIClient-php/lib/Model/EnumClass.php | 4 ---- .../petstore/php/OpenAPIClient-php/lib/Model/EnumTest.php | 4 ---- .../petstore/php/OpenAPIClient-php/lib/Model/File.php | 4 ---- .../php/OpenAPIClient-php/lib/Model/FileSchemaTestClass.php | 4 ---- .../client/petstore/php/OpenAPIClient-php/lib/Model/Foo.php | 4 ---- .../petstore/php/OpenAPIClient-php/lib/Model/FormatTest.php | 4 ---- .../php/OpenAPIClient-php/lib/Model/HasOnlyReadOnly.php | 4 ---- .../php/OpenAPIClient-php/lib/Model/HealthCheckResult.php | 4 ---- .../OpenAPIClient-php/lib/Model/InlineResponseDefault.php | 4 ---- .../petstore/php/OpenAPIClient-php/lib/Model/MapTest.php | 4 ---- .../Model/MixedPropertiesAndAdditionalPropertiesClass.php | 4 ---- .../php/OpenAPIClient-php/lib/Model/Model200Response.php | 4 ---- .../php/OpenAPIClient-php/lib/Model/ModelInterface.php | 4 ---- .../petstore/php/OpenAPIClient-php/lib/Model/ModelList.php | 4 ---- .../php/OpenAPIClient-php/lib/Model/ModelReturn.php | 4 ---- .../petstore/php/OpenAPIClient-php/lib/Model/Name.php | 4 ---- .../php/OpenAPIClient-php/lib/Model/NullableClass.php | 4 ---- .../petstore/php/OpenAPIClient-php/lib/Model/NumberOnly.php | 4 ---- .../petstore/php/OpenAPIClient-php/lib/Model/Order.php | 4 ---- .../php/OpenAPIClient-php/lib/Model/OuterComposite.php | 4 ---- .../petstore/php/OpenAPIClient-php/lib/Model/OuterEnum.php | 4 ---- .../OpenAPIClient-php/lib/Model/OuterEnumDefaultValue.php | 4 ---- .../php/OpenAPIClient-php/lib/Model/OuterEnumInteger.php | 4 ---- .../lib/Model/OuterEnumIntegerDefaultValue.php | 4 ---- .../lib/Model/OuterObjectWithEnumProperty.php | 4 ---- .../client/petstore/php/OpenAPIClient-php/lib/Model/Pet.php | 4 ---- .../php/OpenAPIClient-php/lib/Model/ReadOnlyFirst.php | 4 ---- .../php/OpenAPIClient-php/lib/Model/SpecialModelName.php | 4 ---- .../client/petstore/php/OpenAPIClient-php/lib/Model/Tag.php | 4 ---- .../petstore/php/OpenAPIClient-php/lib/Model/User.php | 4 ---- .../petstore/php/OpenAPIClient-php/lib/ObjectSerializer.php | 4 ---- .../client/petstore/powershell/.openapi-generator/VERSION | 6 +----- .../petstore/python-asyncio/.openapi-generator/VERSION | 6 +----- .../petstore/python-legacy/.openapi-generator/VERSION | 6 +----- .../petstore/python-tornado/.openapi-generator/VERSION | 6 +----- samples/client/petstore/python/.openapi-generator/VERSION | 6 +----- .../.openapi-generator/VERSION | 6 +----- .../client/petstore/ruby-faraday/.openapi-generator/VERSION | 6 +----- samples/client/petstore/ruby-faraday/lib/petstore.rb | 4 ---- .../ruby-faraday/lib/petstore/api/another_fake_api.rb | 4 ---- .../petstore/ruby-faraday/lib/petstore/api/default_api.rb | 4 ---- .../petstore/ruby-faraday/lib/petstore/api/fake_api.rb | 4 ---- .../lib/petstore/api/fake_classname_tags123_api.rb | 4 ---- .../petstore/ruby-faraday/lib/petstore/api/pet_api.rb | 4 ---- .../petstore/ruby-faraday/lib/petstore/api/store_api.rb | 4 ---- .../petstore/ruby-faraday/lib/petstore/api/user_api.rb | 4 ---- .../client/petstore/ruby-faraday/lib/petstore/api_client.rb | 4 ---- .../client/petstore/ruby-faraday/lib/petstore/api_error.rb | 4 ---- .../petstore/ruby-faraday/lib/petstore/configuration.rb | 4 ---- .../lib/petstore/models/additional_properties_class.rb | 4 ---- .../petstore/ruby-faraday/lib/petstore/models/animal.rb | 4 ---- .../ruby-faraday/lib/petstore/models/api_response.rb | 4 ---- .../lib/petstore/models/array_of_array_of_number_only.rb | 4 ---- .../lib/petstore/models/array_of_number_only.rb | 4 ---- .../petstore/ruby-faraday/lib/petstore/models/array_test.rb | 4 ---- .../ruby-faraday/lib/petstore/models/capitalization.rb | 4 ---- .../client/petstore/ruby-faraday/lib/petstore/models/cat.rb | 4 ---- .../petstore/ruby-faraday/lib/petstore/models/cat_all_of.rb | 4 ---- .../petstore/ruby-faraday/lib/petstore/models/category.rb | 4 ---- .../ruby-faraday/lib/petstore/models/class_model.rb | 4 ---- .../petstore/ruby-faraday/lib/petstore/models/client.rb | 4 ---- .../client/petstore/ruby-faraday/lib/petstore/models/dog.rb | 4 ---- .../petstore/ruby-faraday/lib/petstore/models/dog_all_of.rb | 4 ---- .../ruby-faraday/lib/petstore/models/enum_arrays.rb | 4 ---- .../petstore/ruby-faraday/lib/petstore/models/enum_class.rb | 4 ---- .../petstore/ruby-faraday/lib/petstore/models/enum_test.rb | 4 ---- .../petstore/ruby-faraday/lib/petstore/models/file.rb | 4 ---- .../lib/petstore/models/file_schema_test_class.rb | 4 ---- .../client/petstore/ruby-faraday/lib/petstore/models/foo.rb | 4 ---- .../ruby-faraday/lib/petstore/models/format_test.rb | 4 ---- .../ruby-faraday/lib/petstore/models/has_only_read_only.rb | 4 ---- .../ruby-faraday/lib/petstore/models/health_check_result.rb | 4 ---- .../lib/petstore/models/inline_response_default.rb | 4 ---- .../petstore/ruby-faraday/lib/petstore/models/list.rb | 4 ---- .../petstore/ruby-faraday/lib/petstore/models/map_test.rb | 4 ---- .../mixed_properties_and_additional_properties_class.rb | 4 ---- .../ruby-faraday/lib/petstore/models/model200_response.rb | 4 ---- .../ruby-faraday/lib/petstore/models/model_return.rb | 4 ---- .../petstore/ruby-faraday/lib/petstore/models/name.rb | 4 ---- .../ruby-faraday/lib/petstore/models/nullable_class.rb | 4 ---- .../ruby-faraday/lib/petstore/models/number_only.rb | 4 ---- .../petstore/ruby-faraday/lib/petstore/models/order.rb | 4 ---- .../ruby-faraday/lib/petstore/models/outer_composite.rb | 4 ---- .../petstore/ruby-faraday/lib/petstore/models/outer_enum.rb | 4 ---- .../lib/petstore/models/outer_enum_default_value.rb | 4 ---- .../ruby-faraday/lib/petstore/models/outer_enum_integer.rb | 4 ---- .../lib/petstore/models/outer_enum_integer_default_value.rb | 4 ---- .../lib/petstore/models/outer_object_with_enum_property.rb | 4 ---- .../client/petstore/ruby-faraday/lib/petstore/models/pet.rb | 4 ---- .../ruby-faraday/lib/petstore/models/read_only_first.rb | 4 ---- .../ruby-faraday/lib/petstore/models/special_model_name.rb | 4 ---- .../client/petstore/ruby-faraday/lib/petstore/models/tag.rb | 4 ---- .../petstore/ruby-faraday/lib/petstore/models/user.rb | 4 ---- .../client/petstore/ruby-faraday/lib/petstore/version.rb | 4 ---- samples/client/petstore/ruby-faraday/petstore.gemspec | 4 ---- .../client/petstore/ruby-faraday/spec/api_client_spec.rb | 4 ---- .../client/petstore/ruby-faraday/spec/configuration_spec.rb | 4 ---- samples/client/petstore/ruby-faraday/spec/spec_helper.rb | 4 ---- samples/client/petstore/ruby/.openapi-generator/VERSION | 6 +----- samples/client/petstore/ruby/lib/petstore.rb | 4 ---- .../petstore/ruby/lib/petstore/api/another_fake_api.rb | 4 ---- .../client/petstore/ruby/lib/petstore/api/default_api.rb | 4 ---- samples/client/petstore/ruby/lib/petstore/api/fake_api.rb | 4 ---- .../ruby/lib/petstore/api/fake_classname_tags123_api.rb | 4 ---- samples/client/petstore/ruby/lib/petstore/api/pet_api.rb | 4 ---- samples/client/petstore/ruby/lib/petstore/api/store_api.rb | 4 ---- samples/client/petstore/ruby/lib/petstore/api/user_api.rb | 4 ---- samples/client/petstore/ruby/lib/petstore/api_client.rb | 4 ---- samples/client/petstore/ruby/lib/petstore/api_error.rb | 4 ---- samples/client/petstore/ruby/lib/petstore/configuration.rb | 4 ---- .../ruby/lib/petstore/models/additional_properties_class.rb | 4 ---- samples/client/petstore/ruby/lib/petstore/models/animal.rb | 4 ---- .../petstore/ruby/lib/petstore/models/api_response.rb | 4 ---- .../lib/petstore/models/array_of_array_of_number_only.rb | 4 ---- .../ruby/lib/petstore/models/array_of_number_only.rb | 4 ---- .../client/petstore/ruby/lib/petstore/models/array_test.rb | 4 ---- .../petstore/ruby/lib/petstore/models/capitalization.rb | 4 ---- samples/client/petstore/ruby/lib/petstore/models/cat.rb | 4 ---- .../client/petstore/ruby/lib/petstore/models/cat_all_of.rb | 4 ---- .../client/petstore/ruby/lib/petstore/models/category.rb | 4 ---- .../client/petstore/ruby/lib/petstore/models/class_model.rb | 4 ---- samples/client/petstore/ruby/lib/petstore/models/client.rb | 4 ---- samples/client/petstore/ruby/lib/petstore/models/dog.rb | 4 ---- .../client/petstore/ruby/lib/petstore/models/dog_all_of.rb | 4 ---- .../client/petstore/ruby/lib/petstore/models/enum_arrays.rb | 4 ---- .../client/petstore/ruby/lib/petstore/models/enum_class.rb | 4 ---- .../client/petstore/ruby/lib/petstore/models/enum_test.rb | 4 ---- samples/client/petstore/ruby/lib/petstore/models/file.rb | 4 ---- .../ruby/lib/petstore/models/file_schema_test_class.rb | 4 ---- samples/client/petstore/ruby/lib/petstore/models/foo.rb | 4 ---- .../client/petstore/ruby/lib/petstore/models/format_test.rb | 4 ---- .../petstore/ruby/lib/petstore/models/has_only_read_only.rb | 4 ---- .../ruby/lib/petstore/models/health_check_result.rb | 4 ---- .../ruby/lib/petstore/models/inline_response_default.rb | 4 ---- samples/client/petstore/ruby/lib/petstore/models/list.rb | 4 ---- .../client/petstore/ruby/lib/petstore/models/map_test.rb | 4 ---- .../mixed_properties_and_additional_properties_class.rb | 4 ---- .../petstore/ruby/lib/petstore/models/model200_response.rb | 4 ---- .../petstore/ruby/lib/petstore/models/model_return.rb | 4 ---- samples/client/petstore/ruby/lib/petstore/models/name.rb | 4 ---- .../petstore/ruby/lib/petstore/models/nullable_class.rb | 4 ---- .../client/petstore/ruby/lib/petstore/models/number_only.rb | 4 ---- samples/client/petstore/ruby/lib/petstore/models/order.rb | 4 ---- .../petstore/ruby/lib/petstore/models/outer_composite.rb | 4 ---- .../client/petstore/ruby/lib/petstore/models/outer_enum.rb | 4 ---- .../ruby/lib/petstore/models/outer_enum_default_value.rb | 4 ---- .../petstore/ruby/lib/petstore/models/outer_enum_integer.rb | 4 ---- .../lib/petstore/models/outer_enum_integer_default_value.rb | 4 ---- .../lib/petstore/models/outer_object_with_enum_property.rb | 4 ---- samples/client/petstore/ruby/lib/petstore/models/pet.rb | 4 ---- .../petstore/ruby/lib/petstore/models/read_only_first.rb | 4 ---- .../petstore/ruby/lib/petstore/models/special_model_name.rb | 4 ---- samples/client/petstore/ruby/lib/petstore/models/tag.rb | 4 ---- samples/client/petstore/ruby/lib/petstore/models/user.rb | 4 ---- samples/client/petstore/ruby/lib/petstore/version.rb | 4 ---- samples/client/petstore/ruby/petstore.gemspec | 4 ---- samples/client/petstore/ruby/spec/api_client_spec.rb | 4 ---- samples/client/petstore/ruby/spec/configuration_spec.rb | 4 ---- samples/client/petstore/ruby/spec/spec_helper.rb | 4 ---- .../petstore/rust/hyper/petstore/.openapi-generator/VERSION | 6 +----- .../rust/reqwest/petstore-async/.openapi-generator/VERSION | 6 +----- .../rust/reqwest/petstore/.openapi-generator/VERSION | 6 +----- .../client/petstore/scala-akka/.openapi-generator/VERSION | 6 +----- .../scala-httpclient-deprecated/.openapi-generator/VERSION | 2 +- .../client/petstore/scala-sttp/.openapi-generator/VERSION | 6 +----- .../petstore/spring-cloud-async/.openapi-generator/VERSION | 6 +----- .../src/main/java/org/openapitools/api/PetApi.java | 4 ---- .../src/main/java/org/openapitools/api/StoreApi.java | 4 ---- .../src/main/java/org/openapitools/api/UserApi.java | 4 ---- .../spring-cloud-no-nullable/.openapi-generator/VERSION | 6 +----- .../src/main/java/org/openapitools/api/PetApi.java | 4 ---- .../src/main/java/org/openapitools/api/StoreApi.java | 4 ---- .../src/main/java/org/openapitools/api/UserApi.java | 4 ---- .../spring-cloud-spring-pageable/.openapi-generator/VERSION | 6 +----- .../src/main/java/org/openapitools/api/PetApi.java | 4 ---- .../src/main/java/org/openapitools/api/StoreApi.java | 4 ---- .../src/main/java/org/openapitools/api/UserApi.java | 4 ---- .../client/petstore/spring-cloud/.openapi-generator/VERSION | 6 +----- .../src/main/java/org/openapitools/api/PetApi.java | 4 ---- .../src/main/java/org/openapitools/api/StoreApi.java | 4 ---- .../src/main/java/org/openapitools/api/UserApi.java | 4 ---- .../client/petstore/spring-stubs/.openapi-generator/VERSION | 6 +----- .../src/main/java/org/openapitools/api/PetApi.java | 4 ---- .../src/main/java/org/openapitools/api/StoreApi.java | 4 ---- .../src/main/java/org/openapitools/api/UserApi.java | 4 ---- .../swift5/alamofireLibrary/.openapi-generator/VERSION | 6 +----- .../swift5/combineLibrary/.openapi-generator/VERSION | 6 +----- .../petstore/swift5/default/.openapi-generator/VERSION | 6 +----- .../petstore/swift5/deprecated/.openapi-generator/VERSION | 6 +----- .../petstore/swift5/nonPublicApi/.openapi-generator/VERSION | 6 +----- .../swift5/objcCompatible/.openapi-generator/VERSION | 6 +----- .../client/petstore/swift5/oneOf/.openapi-generator/VERSION | 2 +- .../swift5/promisekitLibrary/.openapi-generator/VERSION | 6 +----- .../swift5/readonlyProperties/.openapi-generator/VERSION | 6 +----- .../swift5/resultLibrary/.openapi-generator/VERSION | 6 +----- .../swift5/rxswiftLibrary/.openapi-generator/VERSION | 6 +----- .../swift5/urlsessionLibrary/.openapi-generator/VERSION | 6 +----- .../petstore/swift5/vaporLibrary/.openapi-generator/VERSION | 2 +- .../swift5/x-swift-hashable/.openapi-generator/VERSION | 2 +- .../builds/default/.openapi-generator/VERSION | 6 +----- .../builds/with-npm/.openapi-generator/VERSION | 6 +----- .../builds/default/.openapi-generator/VERSION | 2 +- .../builds/default/.openapi-generator/VERSION | 6 +----- .../builds/with-npm/.openapi-generator/VERSION | 6 +----- .../builds/default/.openapi-generator/VERSION | 6 +----- .../builds/with-npm/.openapi-generator/VERSION | 6 +----- .../builds/default/.openapi-generator/VERSION | 6 +----- .../builds/with-npm/.openapi-generator/VERSION | 6 +----- .../builds/default/.openapi-generator/VERSION | 6 +----- .../builds/with-npm/.openapi-generator/VERSION | 6 +----- .../builds/default/.openapi-generator/VERSION | 6 +----- .../builds/with-npm/.openapi-generator/VERSION | 6 +----- .../single-request-parameter/.openapi-generator/VERSION | 6 +----- .../builds/with-npm/.openapi-generator/VERSION | 6 +----- .../with-prefixed-module-name/.openapi-generator/VERSION | 6 +----- .../builds/default/.openapi-generator/VERSION | 6 +----- .../builds/default/.openapi-generator/VERSION | 6 +----- .../builds/with-npm/.openapi-generator/VERSION | 6 +----- .../typescript-aurelia/default/.openapi-generator/VERSION | 6 +----- .../builds/composed-schemas/.openapi-generator/VERSION | 6 +----- .../builds/default/.openapi-generator/VERSION | 6 +----- .../builds/es6-target/.openapi-generator/VERSION | 6 +----- .../builds/with-complex-headers/.openapi-generator/VERSION | 6 +----- .../.openapi-generator/VERSION | 6 +----- .../builds/with-interfaces/.openapi-generator/VERSION | 6 +----- .../.openapi-generator/VERSION | 6 +----- .../builds/with-npm-version/.openapi-generator/VERSION | 6 +----- .../.openapi-generator/VERSION | 6 +----- .../builds/default-v3.0/.openapi-generator/VERSION | 6 +----- .../builds/default/.openapi-generator/VERSION | 6 +----- .../typescript-fetch/builds/enum/.openapi-generator/VERSION | 6 +----- .../builds/es6-target/.openapi-generator/VERSION | 6 +----- .../builds/multiple-parameters/.openapi-generator/VERSION | 6 +----- .../prefix-parameter-interfaces/.openapi-generator/VERSION | 6 +----- .../builds/sagas-and-records/.openapi-generator/VERSION | 2 +- .../builds/typescript-three-plus/.openapi-generator/VERSION | 6 +----- .../builds/with-interfaces/.openapi-generator/VERSION | 6 +----- .../builds/with-npm-version/.openapi-generator/VERSION | 6 +----- .../without-runtime-checks/.openapi-generator/VERSION | 6 +----- .../typescript-inversify/.openapi-generator/VERSION | 6 +----- .../typescript-jquery/default/.openapi-generator/VERSION | 6 +----- .../typescript-jquery/npm/.openapi-generator/VERSION | 6 +----- .../builds/default/.openapi-generator/VERSION | 6 +----- .../typescript-node/default/.openapi-generator/VERSION | 6 +----- .../petstore/typescript-node/npm/.openapi-generator/VERSION | 6 +----- .../builds/with-npm-version/.openapi-generator/VERSION | 6 +----- .../builds/default/.openapi-generator/VERSION | 6 +----- .../builds/es6-target/.openapi-generator/VERSION | 6 +----- .../builds/with-npm-version/.openapi-generator/VERSION | 6 +----- .../with-progress-subscriber/.openapi-generator/VERSION | 6 +----- .../petstore/protobuf-schema/.openapi-generator/VERSION | 6 +----- samples/meta-codegen/lib/pom.xml | 4 ---- samples/meta-codegen/usage/.openapi-generator/VERSION | 6 +----- samples/openapi3/client/elm/.openapi-generator/VERSION | 6 +----- .../go-experimental/.openapi-generator/VERSION | 6 +----- .../java/jersey2-java8/.openapi-generator/VERSION | 6 +----- .../x-auth-id-alias/python/.openapi-generator/VERSION | 6 +----- .../x-auth-id-alias/ruby-client/.openapi-generator/VERSION | 6 +----- .../x-auth-id-alias/ruby-client/lib/x_auth_id_alias.rb | 4 ---- .../ruby-client/lib/x_auth_id_alias/api/usage_api.rb | 4 ---- .../ruby-client/lib/x_auth_id_alias/api_client.rb | 4 ---- .../ruby-client/lib/x_auth_id_alias/api_error.rb | 4 ---- .../ruby-client/lib/x_auth_id_alias/configuration.rb | 4 ---- .../ruby-client/lib/x_auth_id_alias/version.rb | 4 ---- .../x-auth-id-alias/ruby-client/spec/api_client_spec.rb | 4 ---- .../x-auth-id-alias/ruby-client/spec/configuration_spec.rb | 4 ---- .../x-auth-id-alias/ruby-client/spec/spec_helper.rb | 4 ---- .../x-auth-id-alias/ruby-client/x_auth_id_alias.gemspec | 4 ---- .../dynamic-servers/python/.openapi-generator/VERSION | 6 +----- .../dynamic-servers/ruby/.openapi-generator/VERSION | 6 +----- .../features/dynamic-servers/ruby/dynamic_servers.gemspec | 4 ---- .../features/dynamic-servers/ruby/lib/dynamic_servers.rb | 4 ---- .../ruby/lib/dynamic_servers/api/usage_api.rb | 4 ---- .../dynamic-servers/ruby/lib/dynamic_servers/api_client.rb | 4 ---- .../dynamic-servers/ruby/lib/dynamic_servers/api_error.rb | 4 ---- .../ruby/lib/dynamic_servers/configuration.rb | 4 ---- .../dynamic-servers/ruby/lib/dynamic_servers/version.rb | 4 ---- .../features/dynamic-servers/ruby/spec/api_client_spec.rb | 4 ---- .../dynamic-servers/ruby/spec/configuration_spec.rb | 4 ---- .../features/dynamic-servers/ruby/spec/spec_helper.rb | 4 ---- .../ruby-client/.openapi-generator/VERSION | 6 +----- .../generate-alias-as-model/ruby-client/lib/petstore.rb | 4 ---- .../ruby-client/lib/petstore/api/usage_api.rb | 4 ---- .../ruby-client/lib/petstore/api_client.rb | 4 ---- .../ruby-client/lib/petstore/api_error.rb | 4 ---- .../ruby-client/lib/petstore/configuration.rb | 4 ---- .../ruby-client/lib/petstore/models/array_alias.rb | 4 ---- .../ruby-client/lib/petstore/models/map_alias.rb | 4 ---- .../ruby-client/lib/petstore/version.rb | 4 ---- .../generate-alias-as-model/ruby-client/petstore.gemspec | 4 ---- .../ruby-client/spec/api_client_spec.rb | 4 ---- .../ruby-client/spec/configuration_spec.rb | 4 ---- .../generate-alias-as-model/ruby-client/spec/spec_helper.rb | 4 ---- .../petstore_client_lib_fake/.openapi-generator/VERSION | 6 +----- .../dart-dio/petstore_client_lib/.openapi-generator/VERSION | 6 +----- .../petstore_client_lib_fake/.openapi-generator/VERSION | 6 +----- .../dart2/petstore_client_lib/.openapi-generator/VERSION | 6 +----- .../petstore_client_lib_fake/.openapi-generator/VERSION | 6 +----- .../.openapi-generator/VERSION | 6 +----- .../petstore/go/go-petstore/.openapi-generator/VERSION | 6 +----- .../.openapi-generator/VERSION | 6 +----- .../petstore/java/jersey2-java8/.openapi-generator/VERSION | 6 +----- .../client/petstore/java/native/.openapi-generator/VERSION | 6 +----- .../petstore/python-legacy/.openapi-generator/VERSION | 6 +----- .../client/petstore/python/.openapi-generator/VERSION | 6 +----- .../typescript/builds/default/.openapi-generator/VERSION | 6 +----- .../typescript/builds/deno/.openapi-generator/VERSION | 6 +----- .../typescript/builds/inversify/.openapi-generator/VERSION | 6 +----- .../typescript/builds/jquery/.openapi-generator/VERSION | 6 +----- .../builds/object_params/.openapi-generator/VERSION | 6 +----- samples/schema/petstore/ktorm/.openapi-generator/VERSION | 6 +----- samples/schema/petstore/mysql/.openapi-generator/VERSION | 6 +----- .../schema/petstore/wsdl-schema/.openapi-generator/VERSION | 2 +- .../petstore/aspnetcore-3.0/.openapi-generator/VERSION | 6 +----- .../petstore/aspnetcore-3.1/.openapi-generator/VERSION | 6 +----- .../petstore/aspnetcore-5.0/.openapi-generator/VERSION | 6 +----- .../server/petstore/aspnetcore/.openapi-generator/VERSION | 6 +----- .../server/petstore/cpp-pistache/.openapi-generator/VERSION | 6 +----- .../cpp-qt-qhttpengine-server/.openapi-generator/VERSION | 2 +- .../petstore/erlang-server/.openapi-generator/VERSION | 2 +- .../petstore/go-api-server/.openapi-generator/VERSION | 6 +----- .../petstore/go-chi-server/.openapi-generator/VERSION | 2 +- .../petstore/go-echo-server/.openapi-generator/VERSION | 6 +----- .../petstore/go-gin-api-server/.openapi-generator/VERSION | 6 +----- .../petstore/haskell-servant/.openapi-generator/VERSION | 2 +- .../server/petstore/java-msf4j/.openapi-generator/VERSION | 6 +----- .../.openapi-generator/VERSION | 6 +----- .../java-play-framework-async/.openapi-generator/VERSION | 6 +----- .../.openapi-generator/VERSION | 6 +----- .../.openapi-generator/VERSION | 6 +----- .../.openapi-generator/VERSION | 6 +----- .../.openapi-generator/VERSION | 6 +----- .../.openapi-generator/VERSION | 6 +----- .../.openapi-generator/VERSION | 6 +----- .../.openapi-generator/VERSION | 6 +----- .../.openapi-generator/VERSION | 6 +----- .../petstore/java-play-framework/.openapi-generator/VERSION | 6 +----- .../petstore/java-undertow/.openapi-generator/VERSION | 6 +----- .../petstore/java-vertx-web/.openapi-generator/VERSION | 6 +----- .../.openapi-generator/VERSION | 6 +----- .../jaxrs-cxf-cdi-default-value/.openapi-generator/VERSION | 6 +----- .../petstore/jaxrs-cxf-cdi/.openapi-generator/VERSION | 6 +----- .../jaxrs-cxf-non-spring-app/.openapi-generator/VERSION | 6 +----- .../server/petstore/jaxrs-cxf/.openapi-generator/VERSION | 6 +----- .../petstore/jaxrs-datelib-j8/.openapi-generator/VERSION | 6 +----- .../server/petstore/jaxrs-jersey/.openapi-generator/VERSION | 6 +----- .../jaxrs-resteasy/default-value/.openapi-generator/VERSION | 6 +----- .../jaxrs-resteasy/default/.openapi-generator/VERSION | 6 +----- .../jaxrs-resteasy/eap-java8/.openapi-generator/VERSION | 6 +----- .../jaxrs-resteasy/eap-joda/.openapi-generator/VERSION | 6 +----- .../petstore/jaxrs-resteasy/eap/.openapi-generator/VERSION | 6 +----- .../petstore/jaxrs-resteasy/joda/.openapi-generator/VERSION | 6 +----- .../jaxrs-spec-interface/.openapi-generator/VERSION | 6 +----- .../server/petstore/jaxrs-spec/.openapi-generator/VERSION | 6 +----- .../jaxrs/jersey1-useTags/.openapi-generator/VERSION | 6 +----- .../petstore/jaxrs/jersey1/.openapi-generator/VERSION | 6 +----- .../jaxrs/jersey2-useTags/.openapi-generator/VERSION | 6 +----- .../petstore/jaxrs/jersey2/.openapi-generator/VERSION | 6 +----- .../petstore/kotlin-server/ktor/.openapi-generator/VERSION | 6 +----- samples/server/petstore/kotlin-server/ktor/README.md | 4 ---- .../kotlin-springboot-delegate/.openapi-generator/VERSION | 6 +----- .../src/main/kotlin/org/openapitools/api/PetApi.kt | 4 ---- .../src/main/kotlin/org/openapitools/api/StoreApi.kt | 4 ---- .../src/main/kotlin/org/openapitools/api/UserApi.kt | 4 ---- .../kotlin-springboot-reactive/.openapi-generator/VERSION | 6 +----- .../petstore/kotlin-springboot/.openapi-generator/VERSION | 6 +----- .../server/petstore/php-laravel/.openapi-generator/VERSION | 6 +----- .../server/petstore/php-lumen/.openapi-generator/VERSION | 6 +----- .../php-mezzio-ph-modern/.openapi-generator/VERSION | 2 +- .../petstore/php-mezzio-ph/.openapi-generator/VERSION | 6 +----- .../server/petstore/php-slim4/.openapi-generator/VERSION | 6 +----- .../SymfonyBundle-php/.openapi-generator/VERSION | 6 +----- .../python-aiohttp-srclayout/.openapi-generator/VERSION | 6 +----- .../petstore/python-aiohttp/.openapi-generator/VERSION | 6 +----- .../petstore/python-blueplanet/.openapi-generator/VERSION | 6 +----- .../petstore/python-fastapi/.openapi-generator/VERSION | 2 +- .../server/petstore/python-flask/.openapi-generator/VERSION | 6 +----- .../output/multipart-v3/.openapi-generator/VERSION | 6 +----- .../output/no-example-v3/.openapi-generator/VERSION | 6 +----- .../output/openapi-v3/.openapi-generator/VERSION | 6 +----- .../rust-server/output/ops-v3/.openapi-generator/VERSION | 6 +----- .../.openapi-generator/VERSION | 6 +----- .../output/ping-bearer-auth/.openapi-generator/VERSION | 6 +----- .../output/rust-server-test/.openapi-generator/VERSION | 6 +----- .../spring-mvc-default-value/.openapi-generator/VERSION | 6 +----- .../src/main/java/org/openapitools/api/TestHeadersApi.java | 4 ---- .../main/java/org/openapitools/api/TestQueryParamsApi.java | 4 ---- .../petstore/spring-mvc-j8-async/.openapi-generator/VERSION | 6 +----- .../src/main/java/org/openapitools/api/AnotherFakeApi.java | 4 ---- .../src/main/java/org/openapitools/api/FakeApi.java | 4 ---- .../java/org/openapitools/api/FakeClassnameTestApi.java | 4 ---- .../src/main/java/org/openapitools/api/PetApi.java | 4 ---- .../src/main/java/org/openapitools/api/StoreApi.java | 4 ---- .../src/main/java/org/openapitools/api/UserApi.java | 4 ---- .../spring-mvc-j8-localdatetime/.openapi-generator/VERSION | 6 +----- .../src/main/java/org/openapitools/api/AnotherFakeApi.java | 4 ---- .../src/main/java/org/openapitools/api/FakeApi.java | 4 ---- .../java/org/openapitools/api/FakeClassnameTestApi.java | 4 ---- .../src/main/java/org/openapitools/api/PetApi.java | 4 ---- .../src/main/java/org/openapitools/api/StoreApi.java | 4 ---- .../src/main/java/org/openapitools/api/UserApi.java | 4 ---- .../spring-mvc-no-nullable/.openapi-generator/VERSION | 6 +----- .../src/main/java/org/openapitools/api/AnotherFakeApi.java | 4 ---- .../src/main/java/org/openapitools/api/FakeApi.java | 4 ---- .../java/org/openapitools/api/FakeClassnameTestApi.java | 4 ---- .../src/main/java/org/openapitools/api/PetApi.java | 4 ---- .../src/main/java/org/openapitools/api/StoreApi.java | 4 ---- .../src/main/java/org/openapitools/api/UserApi.java | 4 ---- .../spring-mvc-spring-pageable/.openapi-generator/VERSION | 6 +----- .../src/main/java/org/openapitools/api/AnotherFakeApi.java | 4 ---- .../src/main/java/org/openapitools/api/FakeApi.java | 4 ---- .../java/org/openapitools/api/FakeClassnameTestApi.java | 4 ---- .../src/main/java/org/openapitools/api/PetApi.java | 4 ---- .../src/main/java/org/openapitools/api/StoreApi.java | 4 ---- .../src/main/java/org/openapitools/api/UserApi.java | 4 ---- .../server/petstore/spring-mvc/.openapi-generator/VERSION | 6 +----- .../src/main/java/org/openapitools/api/AnotherFakeApi.java | 4 ---- .../src/main/java/org/openapitools/api/FakeApi.java | 4 ---- .../java/org/openapitools/api/FakeClassnameTestApi.java | 4 ---- .../src/main/java/org/openapitools/api/PetApi.java | 4 ---- .../src/main/java/org/openapitools/api/StoreApi.java | 4 ---- .../src/main/java/org/openapitools/api/UserApi.java | 4 ---- .../.openapi-generator/VERSION | 6 +----- .../src/main/java/org/openapitools/api/AnotherFakeApi.java | 4 ---- .../src/main/java/org/openapitools/api/FakeApi.java | 4 ---- .../java/org/openapitools/api/FakeClassnameTestApi.java | 4 ---- .../src/main/java/org/openapitools/api/PetApi.java | 4 ---- .../src/main/java/org/openapitools/api/StoreApi.java | 4 ---- .../src/main/java/org/openapitools/api/UserApi.java | 4 ---- .../springboot-beanvalidation/.openapi-generator/VERSION | 6 +----- .../src/main/java/org/openapitools/api/AnotherFakeApi.java | 4 ---- .../src/main/java/org/openapitools/api/FakeApi.java | 4 ---- .../java/org/openapitools/api/FakeClassnameTestApi.java | 4 ---- .../src/main/java/org/openapitools/api/PetApi.java | 4 ---- .../src/main/java/org/openapitools/api/StoreApi.java | 4 ---- .../src/main/java/org/openapitools/api/UserApi.java | 4 ---- .../springboot-delegate-j8/.openapi-generator/VERSION | 6 +----- .../src/main/java/org/openapitools/api/AnotherFakeApi.java | 4 ---- .../src/main/java/org/openapitools/api/FakeApi.java | 4 ---- .../java/org/openapitools/api/FakeClassnameTestApi.java | 4 ---- .../src/main/java/org/openapitools/api/PetApi.java | 4 ---- .../src/main/java/org/openapitools/api/StoreApi.java | 4 ---- .../src/main/java/org/openapitools/api/UserApi.java | 4 ---- .../petstore/springboot-delegate/.openapi-generator/VERSION | 6 +----- .../src/main/java/org/openapitools/api/AnotherFakeApi.java | 4 ---- .../src/main/java/org/openapitools/api/FakeApi.java | 4 ---- .../java/org/openapitools/api/FakeClassnameTestApi.java | 4 ---- .../src/main/java/org/openapitools/api/PetApi.java | 4 ---- .../src/main/java/org/openapitools/api/StoreApi.java | 4 ---- .../src/main/java/org/openapitools/api/UserApi.java | 4 ---- .../springboot-implicitHeaders/.openapi-generator/VERSION | 6 +----- .../src/main/java/org/openapitools/api/AnotherFakeApi.java | 4 ---- .../src/main/java/org/openapitools/api/FakeApi.java | 4 ---- .../java/org/openapitools/api/FakeClassnameTestApi.java | 4 ---- .../src/main/java/org/openapitools/api/PetApi.java | 4 ---- .../src/main/java/org/openapitools/api/StoreApi.java | 4 ---- .../src/main/java/org/openapitools/api/UserApi.java | 4 ---- .../petstore/springboot-reactive/.openapi-generator/VERSION | 6 +----- .../src/main/java/org/openapitools/api/AnotherFakeApi.java | 4 ---- .../src/main/java/org/openapitools/api/FakeApi.java | 4 ---- .../java/org/openapitools/api/FakeClassnameTestApi.java | 4 ---- .../src/main/java/org/openapitools/api/PetApi.java | 4 ---- .../src/main/java/org/openapitools/api/StoreApi.java | 4 ---- .../src/main/java/org/openapitools/api/UserApi.java | 4 ---- .../.openapi-generator/VERSION | 6 +----- .../src/main/java/org/openapitools/api/AnotherFakeApi.java | 4 ---- .../src/main/java/org/openapitools/api/FakeApi.java | 4 ---- .../java/org/openapitools/api/FakeClassnameTestApi.java | 4 ---- .../src/main/java/org/openapitools/api/PetApi.java | 4 ---- .../src/main/java/org/openapitools/api/StoreApi.java | 4 ---- .../src/main/java/org/openapitools/api/UserApi.java | 4 ---- .../.openapi-generator/VERSION | 6 +----- .../src/main/java/org/openapitools/api/AnotherFakeApi.java | 4 ---- .../src/main/java/org/openapitools/api/FakeApi.java | 4 ---- .../java/org/openapitools/api/FakeClassnameTestApi.java | 4 ---- .../src/main/java/org/openapitools/api/PetApi.java | 4 ---- .../src/main/java/org/openapitools/api/StoreApi.java | 4 ---- .../src/main/java/org/openapitools/api/UserApi.java | 4 ---- .../.openapi-generator/VERSION | 6 +----- .../src/main/java/org/openapitools/api/AnotherFakeApi.java | 4 ---- .../src/main/java/org/openapitools/api/FakeApi.java | 4 ---- .../java/org/openapitools/api/FakeClassnameTestApi.java | 4 ---- .../src/main/java/org/openapitools/api/PetApi.java | 4 ---- .../src/main/java/org/openapitools/api/StoreApi.java | 4 ---- .../src/main/java/org/openapitools/api/UserApi.java | 4 ---- .../springboot-spring-pageable/.openapi-generator/VERSION | 6 +----- .../src/main/java/org/openapitools/api/AnotherFakeApi.java | 4 ---- .../src/main/java/org/openapitools/api/FakeApi.java | 4 ---- .../java/org/openapitools/api/FakeClassnameTestApi.java | 4 ---- .../src/main/java/org/openapitools/api/PetApi.java | 4 ---- .../src/main/java/org/openapitools/api/StoreApi.java | 4 ---- .../src/main/java/org/openapitools/api/UserApi.java | 4 ---- .../springboot-useoptional/.openapi-generator/VERSION | 6 +----- .../src/main/java/org/openapitools/api/AnotherFakeApi.java | 4 ---- .../src/main/java/org/openapitools/api/FakeApi.java | 4 ---- .../java/org/openapitools/api/FakeClassnameTestApi.java | 4 ---- .../src/main/java/org/openapitools/api/PetApi.java | 4 ---- .../src/main/java/org/openapitools/api/StoreApi.java | 4 ---- .../src/main/java/org/openapitools/api/UserApi.java | 4 ---- .../springboot-virtualan/.openapi-generator/VERSION | 6 +----- .../java/org/openapitools/virtualan/api/AnotherFakeApi.java | 4 ---- .../main/java/org/openapitools/virtualan/api/FakeApi.java | 4 ---- .../openapitools/virtualan/api/FakeClassnameTestApi.java | 4 ---- .../main/java/org/openapitools/virtualan/api/PetApi.java | 4 ---- .../main/java/org/openapitools/virtualan/api/StoreApi.java | 4 ---- .../main/java/org/openapitools/virtualan/api/UserApi.java | 4 ---- .../server/petstore/springboot/.openapi-generator/VERSION | 6 +----- .../src/main/java/org/openapitools/api/AnotherFakeApi.java | 4 ---- .../src/main/java/org/openapitools/api/FakeApi.java | 4 ---- .../java/org/openapitools/api/FakeClassnameTestApi.java | 4 ---- .../src/main/java/org/openapitools/api/PetApi.java | 4 ---- .../src/main/java/org/openapitools/api/StoreApi.java | 4 ---- .../src/main/java/org/openapitools/api/UserApi.java | 4 ---- 656 files changed, 268 insertions(+), 2828 deletions(-) diff --git a/samples/client/petstore/R/.openapi-generator/VERSION b/samples/client/petstore/R/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/R/.openapi-generator/VERSION +++ b/samples/client/petstore/R/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/apex/.openapi-generator/VERSION b/samples/client/petstore/apex/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/apex/.openapi-generator/VERSION +++ b/samples/client/petstore/apex/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/bash/.openapi-generator/VERSION b/samples/client/petstore/bash/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/bash/.openapi-generator/VERSION +++ b/samples/client/petstore/bash/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/c/.openapi-generator/VERSION b/samples/client/petstore/c/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/c/.openapi-generator/VERSION +++ b/samples/client/petstore/c/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/cpp-qt/.openapi-generator/VERSION b/samples/client/petstore/cpp-qt/.openapi-generator/VERSION index 4b448de535c..5f68295fc19 100644 --- a/samples/client/petstore/cpp-qt/.openapi-generator/VERSION +++ b/samples/client/petstore/cpp-qt/.openapi-generator/VERSION @@ -1 +1 @@ -5.3.0-SNAPSHOT \ No newline at end of file +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/cpp-restsdk/client/.openapi-generator/VERSION b/samples/client/petstore/cpp-restsdk/client/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/cpp-restsdk/client/.openapi-generator/VERSION +++ b/samples/client/petstore/cpp-restsdk/client/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/cpp-restsdk/client/ApiClient.cpp b/samples/client/petstore/cpp-restsdk/client/ApiClient.cpp index b4b88d752fe..9ec1a3c1291 100644 --- a/samples/client/petstore/cpp-restsdk/client/ApiClient.cpp +++ b/samples/client/petstore/cpp-restsdk/client/ApiClient.cpp @@ -4,11 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI-Generator 6.0.0-SNAPSHOT. -======= - * NOTE: This class is auto generated by OpenAPI-Generator 5.3.0-SNAPSHOT. ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/ApiClient.h b/samples/client/petstore/cpp-restsdk/client/ApiClient.h index 35591953b2a..a6f0ad08b3a 100644 --- a/samples/client/petstore/cpp-restsdk/client/ApiClient.h +++ b/samples/client/petstore/cpp-restsdk/client/ApiClient.h @@ -4,11 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI-Generator 6.0.0-SNAPSHOT. -======= - * NOTE: This class is auto generated by OpenAPI-Generator 5.3.0-SNAPSHOT. ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/ApiConfiguration.cpp b/samples/client/petstore/cpp-restsdk/client/ApiConfiguration.cpp index 520c42757ab..2be29a96b9a 100644 --- a/samples/client/petstore/cpp-restsdk/client/ApiConfiguration.cpp +++ b/samples/client/petstore/cpp-restsdk/client/ApiConfiguration.cpp @@ -4,11 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI-Generator 6.0.0-SNAPSHOT. -======= - * NOTE: This class is auto generated by OpenAPI-Generator 5.3.0-SNAPSHOT. ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/ApiConfiguration.h b/samples/client/petstore/cpp-restsdk/client/ApiConfiguration.h index acaa0d25ab5..791d5fbc12e 100644 --- a/samples/client/petstore/cpp-restsdk/client/ApiConfiguration.h +++ b/samples/client/petstore/cpp-restsdk/client/ApiConfiguration.h @@ -4,11 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI-Generator 6.0.0-SNAPSHOT. -======= - * NOTE: This class is auto generated by OpenAPI-Generator 5.3.0-SNAPSHOT. ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/ApiException.cpp b/samples/client/petstore/cpp-restsdk/client/ApiException.cpp index 876f0759172..9df267c0181 100644 --- a/samples/client/petstore/cpp-restsdk/client/ApiException.cpp +++ b/samples/client/petstore/cpp-restsdk/client/ApiException.cpp @@ -4,11 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI-Generator 6.0.0-SNAPSHOT. -======= - * NOTE: This class is auto generated by OpenAPI-Generator 5.3.0-SNAPSHOT. ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/ApiException.h b/samples/client/petstore/cpp-restsdk/client/ApiException.h index 7972c97aa1e..665ee4f62a9 100644 --- a/samples/client/petstore/cpp-restsdk/client/ApiException.h +++ b/samples/client/petstore/cpp-restsdk/client/ApiException.h @@ -4,11 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI-Generator 6.0.0-SNAPSHOT. -======= - * NOTE: This class is auto generated by OpenAPI-Generator 5.3.0-SNAPSHOT. ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/HttpContent.cpp b/samples/client/petstore/cpp-restsdk/client/HttpContent.cpp index c5be624f16e..e21d136df25 100644 --- a/samples/client/petstore/cpp-restsdk/client/HttpContent.cpp +++ b/samples/client/petstore/cpp-restsdk/client/HttpContent.cpp @@ -4,11 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI-Generator 6.0.0-SNAPSHOT. -======= - * NOTE: This class is auto generated by OpenAPI-Generator 5.3.0-SNAPSHOT. ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/HttpContent.h b/samples/client/petstore/cpp-restsdk/client/HttpContent.h index 1e5ed53d2cb..28cb37a8fe5 100644 --- a/samples/client/petstore/cpp-restsdk/client/HttpContent.h +++ b/samples/client/petstore/cpp-restsdk/client/HttpContent.h @@ -4,11 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI-Generator 6.0.0-SNAPSHOT. -======= - * NOTE: This class is auto generated by OpenAPI-Generator 5.3.0-SNAPSHOT. ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/IHttpBody.h b/samples/client/petstore/cpp-restsdk/client/IHttpBody.h index 7fe675d8ff2..7ce2577f5be 100644 --- a/samples/client/petstore/cpp-restsdk/client/IHttpBody.h +++ b/samples/client/petstore/cpp-restsdk/client/IHttpBody.h @@ -4,11 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI-Generator 6.0.0-SNAPSHOT. -======= - * NOTE: This class is auto generated by OpenAPI-Generator 5.3.0-SNAPSHOT. ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/JsonBody.cpp b/samples/client/petstore/cpp-restsdk/client/JsonBody.cpp index ee3bf94e2e2..5d03753cfff 100644 --- a/samples/client/petstore/cpp-restsdk/client/JsonBody.cpp +++ b/samples/client/petstore/cpp-restsdk/client/JsonBody.cpp @@ -4,11 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI-Generator 6.0.0-SNAPSHOT. -======= - * NOTE: This class is auto generated by OpenAPI-Generator 5.3.0-SNAPSHOT. ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/JsonBody.h b/samples/client/petstore/cpp-restsdk/client/JsonBody.h index 5384d885c99..7700434e8c3 100644 --- a/samples/client/petstore/cpp-restsdk/client/JsonBody.h +++ b/samples/client/petstore/cpp-restsdk/client/JsonBody.h @@ -4,11 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI-Generator 6.0.0-SNAPSHOT. -======= - * NOTE: This class is auto generated by OpenAPI-Generator 5.3.0-SNAPSHOT. ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/ModelBase.cpp b/samples/client/petstore/cpp-restsdk/client/ModelBase.cpp index ec8be5072af..9f19e054e5a 100644 --- a/samples/client/petstore/cpp-restsdk/client/ModelBase.cpp +++ b/samples/client/petstore/cpp-restsdk/client/ModelBase.cpp @@ -4,11 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI-Generator 6.0.0-SNAPSHOT. -======= - * NOTE: This class is auto generated by OpenAPI-Generator 5.3.0-SNAPSHOT. ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/ModelBase.h b/samples/client/petstore/cpp-restsdk/client/ModelBase.h index bec272866c9..33f1f0977ac 100644 --- a/samples/client/petstore/cpp-restsdk/client/ModelBase.h +++ b/samples/client/petstore/cpp-restsdk/client/ModelBase.h @@ -4,11 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI-Generator 6.0.0-SNAPSHOT. -======= - * NOTE: This class is auto generated by OpenAPI-Generator 5.3.0-SNAPSHOT. ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/MultipartFormData.cpp b/samples/client/petstore/cpp-restsdk/client/MultipartFormData.cpp index 5d6d39ffa9a..7af87c42e37 100644 --- a/samples/client/petstore/cpp-restsdk/client/MultipartFormData.cpp +++ b/samples/client/petstore/cpp-restsdk/client/MultipartFormData.cpp @@ -4,11 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI-Generator 6.0.0-SNAPSHOT. -======= - * NOTE: This class is auto generated by OpenAPI-Generator 5.3.0-SNAPSHOT. ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/MultipartFormData.h b/samples/client/petstore/cpp-restsdk/client/MultipartFormData.h index 0b2773b91d8..0e25caef84b 100644 --- a/samples/client/petstore/cpp-restsdk/client/MultipartFormData.h +++ b/samples/client/petstore/cpp-restsdk/client/MultipartFormData.h @@ -4,11 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI-Generator 6.0.0-SNAPSHOT. -======= - * NOTE: This class is auto generated by OpenAPI-Generator 5.3.0-SNAPSHOT. ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/Object.cpp b/samples/client/petstore/cpp-restsdk/client/Object.cpp index 649af998f24..620e9e30e80 100644 --- a/samples/client/petstore/cpp-restsdk/client/Object.cpp +++ b/samples/client/petstore/cpp-restsdk/client/Object.cpp @@ -4,11 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI-Generator 6.0.0-SNAPSHOT. -======= - * NOTE: This class is auto generated by OpenAPI-Generator 5.3.0-SNAPSHOT. ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/Object.h b/samples/client/petstore/cpp-restsdk/client/Object.h index 3b318b8b69b..8dc027cb4df 100644 --- a/samples/client/petstore/cpp-restsdk/client/Object.h +++ b/samples/client/petstore/cpp-restsdk/client/Object.h @@ -4,11 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI-Generator 6.0.0-SNAPSHOT. -======= - * NOTE: This class is auto generated by OpenAPI-Generator 5.3.0-SNAPSHOT. ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/api/PetApi.cpp b/samples/client/petstore/cpp-restsdk/client/api/PetApi.cpp index ce2ea7e7629..7c7b63f1804 100644 --- a/samples/client/petstore/cpp-restsdk/client/api/PetApi.cpp +++ b/samples/client/petstore/cpp-restsdk/client/api/PetApi.cpp @@ -4,11 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI-Generator 6.0.0-SNAPSHOT. -======= - * NOTE: This class is auto generated by OpenAPI-Generator 5.3.0-SNAPSHOT. ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/api/PetApi.h b/samples/client/petstore/cpp-restsdk/client/api/PetApi.h index a6b5d6cbe2f..52d61688482 100644 --- a/samples/client/petstore/cpp-restsdk/client/api/PetApi.h +++ b/samples/client/petstore/cpp-restsdk/client/api/PetApi.h @@ -4,11 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI-Generator 6.0.0-SNAPSHOT. -======= - * NOTE: This class is auto generated by OpenAPI-Generator 5.3.0-SNAPSHOT. ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/api/StoreApi.cpp b/samples/client/petstore/cpp-restsdk/client/api/StoreApi.cpp index 9a83aaca40d..7d347ca96d9 100644 --- a/samples/client/petstore/cpp-restsdk/client/api/StoreApi.cpp +++ b/samples/client/petstore/cpp-restsdk/client/api/StoreApi.cpp @@ -4,11 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI-Generator 6.0.0-SNAPSHOT. -======= - * NOTE: This class is auto generated by OpenAPI-Generator 5.3.0-SNAPSHOT. ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/api/StoreApi.h b/samples/client/petstore/cpp-restsdk/client/api/StoreApi.h index e11d78a4967..89ccea78d06 100644 --- a/samples/client/petstore/cpp-restsdk/client/api/StoreApi.h +++ b/samples/client/petstore/cpp-restsdk/client/api/StoreApi.h @@ -4,11 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI-Generator 6.0.0-SNAPSHOT. -======= - * NOTE: This class is auto generated by OpenAPI-Generator 5.3.0-SNAPSHOT. ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/api/UserApi.cpp b/samples/client/petstore/cpp-restsdk/client/api/UserApi.cpp index a82924ffef0..1ad3d50f0d5 100644 --- a/samples/client/petstore/cpp-restsdk/client/api/UserApi.cpp +++ b/samples/client/petstore/cpp-restsdk/client/api/UserApi.cpp @@ -4,11 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI-Generator 6.0.0-SNAPSHOT. -======= - * NOTE: This class is auto generated by OpenAPI-Generator 5.3.0-SNAPSHOT. ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/api/UserApi.h b/samples/client/petstore/cpp-restsdk/client/api/UserApi.h index 40e4cd6deba..943d13757ea 100644 --- a/samples/client/petstore/cpp-restsdk/client/api/UserApi.h +++ b/samples/client/petstore/cpp-restsdk/client/api/UserApi.h @@ -4,11 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI-Generator 6.0.0-SNAPSHOT. -======= - * NOTE: This class is auto generated by OpenAPI-Generator 5.3.0-SNAPSHOT. ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/model/ApiResponse.cpp b/samples/client/petstore/cpp-restsdk/client/model/ApiResponse.cpp index 4538885e5e2..240b8ca1682 100644 --- a/samples/client/petstore/cpp-restsdk/client/model/ApiResponse.cpp +++ b/samples/client/petstore/cpp-restsdk/client/model/ApiResponse.cpp @@ -4,11 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI-Generator 6.0.0-SNAPSHOT. -======= - * NOTE: This class is auto generated by OpenAPI-Generator 5.3.0-SNAPSHOT. ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/model/ApiResponse.h b/samples/client/petstore/cpp-restsdk/client/model/ApiResponse.h index 9073577a144..aa992da1771 100644 --- a/samples/client/petstore/cpp-restsdk/client/model/ApiResponse.h +++ b/samples/client/petstore/cpp-restsdk/client/model/ApiResponse.h @@ -4,11 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI-Generator 6.0.0-SNAPSHOT. -======= - * NOTE: This class is auto generated by OpenAPI-Generator 5.3.0-SNAPSHOT. ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/model/Category.cpp b/samples/client/petstore/cpp-restsdk/client/model/Category.cpp index 1fadd278e6e..2cbfe4ed64d 100644 --- a/samples/client/petstore/cpp-restsdk/client/model/Category.cpp +++ b/samples/client/petstore/cpp-restsdk/client/model/Category.cpp @@ -4,11 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI-Generator 6.0.0-SNAPSHOT. -======= - * NOTE: This class is auto generated by OpenAPI-Generator 5.3.0-SNAPSHOT. ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/model/Category.h b/samples/client/petstore/cpp-restsdk/client/model/Category.h index e5640bd4664..7a0e66e8538 100644 --- a/samples/client/petstore/cpp-restsdk/client/model/Category.h +++ b/samples/client/petstore/cpp-restsdk/client/model/Category.h @@ -4,11 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI-Generator 6.0.0-SNAPSHOT. -======= - * NOTE: This class is auto generated by OpenAPI-Generator 5.3.0-SNAPSHOT. ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/model/Order.cpp b/samples/client/petstore/cpp-restsdk/client/model/Order.cpp index 5312c11f010..0533c250bd7 100644 --- a/samples/client/petstore/cpp-restsdk/client/model/Order.cpp +++ b/samples/client/petstore/cpp-restsdk/client/model/Order.cpp @@ -4,11 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI-Generator 6.0.0-SNAPSHOT. -======= - * NOTE: This class is auto generated by OpenAPI-Generator 5.3.0-SNAPSHOT. ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/model/Order.h b/samples/client/petstore/cpp-restsdk/client/model/Order.h index f14b2bbf49f..f6fa17a75d5 100644 --- a/samples/client/petstore/cpp-restsdk/client/model/Order.h +++ b/samples/client/petstore/cpp-restsdk/client/model/Order.h @@ -4,11 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI-Generator 6.0.0-SNAPSHOT. -======= - * NOTE: This class is auto generated by OpenAPI-Generator 5.3.0-SNAPSHOT. ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/model/Pet.cpp b/samples/client/petstore/cpp-restsdk/client/model/Pet.cpp index 57af78e51cd..8a52519bd6a 100644 --- a/samples/client/petstore/cpp-restsdk/client/model/Pet.cpp +++ b/samples/client/petstore/cpp-restsdk/client/model/Pet.cpp @@ -4,11 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI-Generator 6.0.0-SNAPSHOT. -======= - * NOTE: This class is auto generated by OpenAPI-Generator 5.3.0-SNAPSHOT. ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/model/Pet.h b/samples/client/petstore/cpp-restsdk/client/model/Pet.h index 4ce48bb628a..581042fa91d 100644 --- a/samples/client/petstore/cpp-restsdk/client/model/Pet.h +++ b/samples/client/petstore/cpp-restsdk/client/model/Pet.h @@ -4,11 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI-Generator 6.0.0-SNAPSHOT. -======= - * NOTE: This class is auto generated by OpenAPI-Generator 5.3.0-SNAPSHOT. ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/model/Tag.cpp b/samples/client/petstore/cpp-restsdk/client/model/Tag.cpp index 6ea4ce4f37a..f7cec46aa43 100644 --- a/samples/client/petstore/cpp-restsdk/client/model/Tag.cpp +++ b/samples/client/petstore/cpp-restsdk/client/model/Tag.cpp @@ -4,11 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI-Generator 6.0.0-SNAPSHOT. -======= - * NOTE: This class is auto generated by OpenAPI-Generator 5.3.0-SNAPSHOT. ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/model/Tag.h b/samples/client/petstore/cpp-restsdk/client/model/Tag.h index 0cd036a86f3..3dac8f1f790 100644 --- a/samples/client/petstore/cpp-restsdk/client/model/Tag.h +++ b/samples/client/petstore/cpp-restsdk/client/model/Tag.h @@ -4,11 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI-Generator 6.0.0-SNAPSHOT. -======= - * NOTE: This class is auto generated by OpenAPI-Generator 5.3.0-SNAPSHOT. ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/model/User.cpp b/samples/client/petstore/cpp-restsdk/client/model/User.cpp index e686817a29f..d0981f41ccd 100644 --- a/samples/client/petstore/cpp-restsdk/client/model/User.cpp +++ b/samples/client/petstore/cpp-restsdk/client/model/User.cpp @@ -4,11 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI-Generator 6.0.0-SNAPSHOT. -======= - * NOTE: This class is auto generated by OpenAPI-Generator 5.3.0-SNAPSHOT. ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-restsdk/client/model/User.h b/samples/client/petstore/cpp-restsdk/client/model/User.h index b2e8acb922d..757a48ae8a7 100644 --- a/samples/client/petstore/cpp-restsdk/client/model/User.h +++ b/samples/client/petstore/cpp-restsdk/client/model/User.h @@ -4,11 +4,7 @@ * * The version of the OpenAPI document: 1.0.0 * -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI-Generator 6.0.0-SNAPSHOT. -======= - * NOTE: This class is auto generated by OpenAPI-Generator 5.3.0-SNAPSHOT. ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/cpp-tiny/.openapi-generator/VERSION b/samples/client/petstore/cpp-tiny/.openapi-generator/VERSION index 4b448de535c..5f68295fc19 100644 --- a/samples/client/petstore/cpp-tiny/.openapi-generator/VERSION +++ b/samples/client/petstore/cpp-tiny/.openapi-generator/VERSION @@ -1 +1 @@ -5.3.0-SNAPSHOT \ No newline at end of file +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/crystal/.openapi-generator/VERSION b/samples/client/petstore/crystal/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/crystal/.openapi-generator/VERSION +++ b/samples/client/petstore/crystal/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/crystal/.travis.yml b/samples/client/petstore/crystal/.travis.yml index c94f5891df2..572732b4a5b 100644 --- a/samples/client/petstore/crystal/.travis.yml +++ b/samples/client/petstore/crystal/.travis.yml @@ -5,11 +5,7 @@ #The version of the OpenAPI document: 1.0.0 # #Generated by: https://openapi-generator.tech -<<<<<<< HEAD #OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -#OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x # language: crystal diff --git a/samples/client/petstore/crystal/spec/spec_helper.cr b/samples/client/petstore/crystal/spec/spec_helper.cr index 6728fcac6f2..dddb173a221 100644 --- a/samples/client/petstore/crystal/spec/spec_helper.cr +++ b/samples/client/petstore/crystal/spec/spec_helper.cr @@ -5,11 +5,7 @@ #The version of the OpenAPI document: 1.0.0 # #Generated by: https://openapi-generator.tech -<<<<<<< HEAD #OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -#OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x # # load modules diff --git a/samples/client/petstore/crystal/src/petstore.cr b/samples/client/petstore/crystal/src/petstore.cr index 765503bdf7a..437668994c4 100644 --- a/samples/client/petstore/crystal/src/petstore.cr +++ b/samples/client/petstore/crystal/src/petstore.cr @@ -5,11 +5,7 @@ #The version of the OpenAPI document: 1.0.0 # #Generated by: https://openapi-generator.tech -<<<<<<< HEAD #OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -#OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x # # Dependencies diff --git a/samples/client/petstore/crystal/src/petstore/api/pet_api.cr b/samples/client/petstore/crystal/src/petstore/api/pet_api.cr index 1c8ad8d1565..320d12fd421 100644 --- a/samples/client/petstore/crystal/src/petstore/api/pet_api.cr +++ b/samples/client/petstore/crystal/src/petstore/api/pet_api.cr @@ -5,11 +5,7 @@ #The version of the OpenAPI document: 1.0.0 # #Generated by: https://openapi-generator.tech -<<<<<<< HEAD #OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -#OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x # require "uri" diff --git a/samples/client/petstore/crystal/src/petstore/api/store_api.cr b/samples/client/petstore/crystal/src/petstore/api/store_api.cr index 310b1035d80..101bfd48d63 100644 --- a/samples/client/petstore/crystal/src/petstore/api/store_api.cr +++ b/samples/client/petstore/crystal/src/petstore/api/store_api.cr @@ -5,11 +5,7 @@ #The version of the OpenAPI document: 1.0.0 # #Generated by: https://openapi-generator.tech -<<<<<<< HEAD #OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -#OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x # require "uri" diff --git a/samples/client/petstore/crystal/src/petstore/api/user_api.cr b/samples/client/petstore/crystal/src/petstore/api/user_api.cr index 8eb232d68a5..f015319ddf5 100644 --- a/samples/client/petstore/crystal/src/petstore/api/user_api.cr +++ b/samples/client/petstore/crystal/src/petstore/api/user_api.cr @@ -5,11 +5,7 @@ #The version of the OpenAPI document: 1.0.0 # #Generated by: https://openapi-generator.tech -<<<<<<< HEAD #OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -#OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x # require "uri" diff --git a/samples/client/petstore/crystal/src/petstore/api_client.cr b/samples/client/petstore/crystal/src/petstore/api_client.cr index 50e5933b80b..3d512d32aea 100644 --- a/samples/client/petstore/crystal/src/petstore/api_client.cr +++ b/samples/client/petstore/crystal/src/petstore/api_client.cr @@ -5,11 +5,7 @@ #The version of the OpenAPI document: 1.0.0 # #Generated by: https://openapi-generator.tech -<<<<<<< HEAD #OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -#OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x # require "json" diff --git a/samples/client/petstore/crystal/src/petstore/api_error.cr b/samples/client/petstore/crystal/src/petstore/api_error.cr index f58acc52a2a..03555af9b6a 100644 --- a/samples/client/petstore/crystal/src/petstore/api_error.cr +++ b/samples/client/petstore/crystal/src/petstore/api_error.cr @@ -5,11 +5,7 @@ #The version of the OpenAPI document: 1.0.0 # #Generated by: https://openapi-generator.tech -<<<<<<< HEAD #OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -#OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x # module Petstore diff --git a/samples/client/petstore/crystal/src/petstore/configuration.cr b/samples/client/petstore/crystal/src/petstore/configuration.cr index 5226ca95cbd..4a1b84a4902 100644 --- a/samples/client/petstore/crystal/src/petstore/configuration.cr +++ b/samples/client/petstore/crystal/src/petstore/configuration.cr @@ -5,11 +5,7 @@ #The version of the OpenAPI document: 1.0.0 # #Generated by: https://openapi-generator.tech -<<<<<<< HEAD #OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -#OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x # require "log" diff --git a/samples/client/petstore/crystal/src/petstore/models/api_response.cr b/samples/client/petstore/crystal/src/petstore/models/api_response.cr index 1bd454ff570..3359594145f 100644 --- a/samples/client/petstore/crystal/src/petstore/models/api_response.cr +++ b/samples/client/petstore/crystal/src/petstore/models/api_response.cr @@ -5,11 +5,7 @@ #The version of the OpenAPI document: 1.0.0 # #Generated by: https://openapi-generator.tech -<<<<<<< HEAD #OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -#OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x # require "json" diff --git a/samples/client/petstore/crystal/src/petstore/models/category.cr b/samples/client/petstore/crystal/src/petstore/models/category.cr index 4a5b2b176ad..0fb84faf74b 100644 --- a/samples/client/petstore/crystal/src/petstore/models/category.cr +++ b/samples/client/petstore/crystal/src/petstore/models/category.cr @@ -5,11 +5,7 @@ #The version of the OpenAPI document: 1.0.0 # #Generated by: https://openapi-generator.tech -<<<<<<< HEAD #OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -#OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x # require "json" diff --git a/samples/client/petstore/crystal/src/petstore/models/order.cr b/samples/client/petstore/crystal/src/petstore/models/order.cr index 8e782ea72fd..656c61b86b7 100644 --- a/samples/client/petstore/crystal/src/petstore/models/order.cr +++ b/samples/client/petstore/crystal/src/petstore/models/order.cr @@ -5,11 +5,7 @@ #The version of the OpenAPI document: 1.0.0 # #Generated by: https://openapi-generator.tech -<<<<<<< HEAD #OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -#OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x # require "json" diff --git a/samples/client/petstore/crystal/src/petstore/models/pet.cr b/samples/client/petstore/crystal/src/petstore/models/pet.cr index 3e3f8fde44d..c6471d5672a 100644 --- a/samples/client/petstore/crystal/src/petstore/models/pet.cr +++ b/samples/client/petstore/crystal/src/petstore/models/pet.cr @@ -5,11 +5,7 @@ #The version of the OpenAPI document: 1.0.0 # #Generated by: https://openapi-generator.tech -<<<<<<< HEAD #OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -#OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x # require "json" diff --git a/samples/client/petstore/crystal/src/petstore/models/tag.cr b/samples/client/petstore/crystal/src/petstore/models/tag.cr index f2b81f2f6d2..ab09edc3291 100644 --- a/samples/client/petstore/crystal/src/petstore/models/tag.cr +++ b/samples/client/petstore/crystal/src/petstore/models/tag.cr @@ -5,11 +5,7 @@ #The version of the OpenAPI document: 1.0.0 # #Generated by: https://openapi-generator.tech -<<<<<<< HEAD #OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -#OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x # require "json" diff --git a/samples/client/petstore/crystal/src/petstore/models/user.cr b/samples/client/petstore/crystal/src/petstore/models/user.cr index acfc1431f59..8c0fbfde5dc 100644 --- a/samples/client/petstore/crystal/src/petstore/models/user.cr +++ b/samples/client/petstore/crystal/src/petstore/models/user.cr @@ -5,11 +5,7 @@ #The version of the OpenAPI document: 1.0.0 # #Generated by: https://openapi-generator.tech -<<<<<<< HEAD #OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -#OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x # require "json" diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/.openapi-generator/VERSION b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/.openapi-generator/VERSION index 4b448de535c..5f68295fc19 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/.openapi-generator/VERSION +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/.openapi-generator/VERSION @@ -1 +1 @@ -5.3.0-SNAPSHOT \ No newline at end of file +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/.openapi-generator/VERSION b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/.openapi-generator/VERSION +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/.openapi-generator/VERSION b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/.openapi-generator/VERSION +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/.openapi-generator/VERSION b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/.openapi-generator/VERSION +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/.openapi-generator/VERSION b/samples/client/petstore/csharp-netcore/OpenAPIClient/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient/.openapi-generator/VERSION +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/.openapi-generator/VERSION b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/.openapi-generator/VERSION +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/.openapi-generator/VERSION b/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/.openapi-generator/VERSION +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/csharp/OpenAPIClient/.openapi-generator/VERSION b/samples/client/petstore/csharp/OpenAPIClient/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/csharp/OpenAPIClient/.openapi-generator/VERSION +++ b/samples/client/petstore/csharp/OpenAPIClient/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/elixir/.openapi-generator/VERSION b/samples/client/petstore/elixir/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/elixir/.openapi-generator/VERSION +++ b/samples/client/petstore/elixir/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/go/go-petstore/.openapi-generator/VERSION b/samples/client/petstore/go/go-petstore/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/go/go-petstore/.openapi-generator/VERSION +++ b/samples/client/petstore/go/go-petstore/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/groovy/.openapi-generator/VERSION b/samples/client/petstore/groovy/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/groovy/.openapi-generator/VERSION +++ b/samples/client/petstore/groovy/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/haskell-http-client/.openapi-generator/VERSION b/samples/client/petstore/haskell-http-client/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/haskell-http-client/.openapi-generator/VERSION +++ b/samples/client/petstore/haskell-http-client/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/java/feign-no-nullable/.openapi-generator/VERSION b/samples/client/petstore/java/feign-no-nullable/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/java/feign-no-nullable/.openapi-generator/VERSION +++ b/samples/client/petstore/java/feign-no-nullable/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/java/feign/.openapi-generator/VERSION b/samples/client/petstore/java/feign/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/java/feign/.openapi-generator/VERSION +++ b/samples/client/petstore/java/feign/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/java/google-api-client/.openapi-generator/VERSION b/samples/client/petstore/java/google-api-client/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/java/google-api-client/.openapi-generator/VERSION +++ b/samples/client/petstore/java/google-api-client/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/java/jersey1/.openapi-generator/VERSION b/samples/client/petstore/java/jersey1/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/java/jersey1/.openapi-generator/VERSION +++ b/samples/client/petstore/java/jersey1/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/.openapi-generator/VERSION b/samples/client/petstore/java/jersey2-java8-localdatetime/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/java/jersey2-java8-localdatetime/.openapi-generator/VERSION +++ b/samples/client/petstore/java/jersey2-java8-localdatetime/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/java/jersey2-java8/.openapi-generator/VERSION b/samples/client/petstore/java/jersey2-java8/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/java/jersey2-java8/.openapi-generator/VERSION +++ b/samples/client/petstore/java/jersey2-java8/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/java/microprofile-rest-client/.openapi-generator/VERSION b/samples/client/petstore/java/microprofile-rest-client/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/java/microprofile-rest-client/.openapi-generator/VERSION +++ b/samples/client/petstore/java/microprofile-rest-client/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/java/native-async/.openapi-generator/VERSION b/samples/client/petstore/java/native-async/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/java/native-async/.openapi-generator/VERSION +++ b/samples/client/petstore/java/native-async/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/java/native/.openapi-generator/VERSION b/samples/client/petstore/java/native/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/java/native/.openapi-generator/VERSION +++ b/samples/client/petstore/java/native/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/.openapi-generator/VERSION b/samples/client/petstore/java/okhttp-gson-dynamicOperations/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/.openapi-generator/VERSION +++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/.openapi-generator/VERSION b/samples/client/petstore/java/okhttp-gson-parcelableModel/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/java/okhttp-gson-parcelableModel/.openapi-generator/VERSION +++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/java/okhttp-gson/.openapi-generator/VERSION b/samples/client/petstore/java/okhttp-gson/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/java/okhttp-gson/.openapi-generator/VERSION +++ b/samples/client/petstore/java/okhttp-gson/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/java/rest-assured-jackson/.openapi-generator/VERSION b/samples/client/petstore/java/rest-assured-jackson/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/java/rest-assured-jackson/.openapi-generator/VERSION +++ b/samples/client/petstore/java/rest-assured-jackson/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/java/rest-assured/.openapi-generator/VERSION b/samples/client/petstore/java/rest-assured/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/java/rest-assured/.openapi-generator/VERSION +++ b/samples/client/petstore/java/rest-assured/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/java/resteasy/.openapi-generator/VERSION b/samples/client/petstore/java/resteasy/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/java/resteasy/.openapi-generator/VERSION +++ b/samples/client/petstore/java/resteasy/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/java/resttemplate-withXml/.openapi-generator/VERSION b/samples/client/petstore/java/resttemplate-withXml/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/java/resttemplate-withXml/.openapi-generator/VERSION +++ b/samples/client/petstore/java/resttemplate-withXml/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/java/resttemplate/.openapi-generator/VERSION b/samples/client/petstore/java/resttemplate/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/java/resttemplate/.openapi-generator/VERSION +++ b/samples/client/petstore/java/resttemplate/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/java/retrofit2-play26/.openapi-generator/VERSION b/samples/client/petstore/java/retrofit2-play26/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/java/retrofit2-play26/.openapi-generator/VERSION +++ b/samples/client/petstore/java/retrofit2-play26/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/java/retrofit2/.openapi-generator/VERSION b/samples/client/petstore/java/retrofit2/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/java/retrofit2/.openapi-generator/VERSION +++ b/samples/client/petstore/java/retrofit2/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/java/retrofit2rx2/.openapi-generator/VERSION b/samples/client/petstore/java/retrofit2rx2/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/java/retrofit2rx2/.openapi-generator/VERSION +++ b/samples/client/petstore/java/retrofit2rx2/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/java/retrofit2rx3/.openapi-generator/VERSION b/samples/client/petstore/java/retrofit2rx3/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/java/retrofit2rx3/.openapi-generator/VERSION +++ b/samples/client/petstore/java/retrofit2rx3/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/java/vertx-no-nullable/.openapi-generator/VERSION b/samples/client/petstore/java/vertx-no-nullable/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/java/vertx-no-nullable/.openapi-generator/VERSION +++ b/samples/client/petstore/java/vertx-no-nullable/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/java/vertx/.openapi-generator/VERSION b/samples/client/petstore/java/vertx/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/java/vertx/.openapi-generator/VERSION +++ b/samples/client/petstore/java/vertx/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/java/webclient/.openapi-generator/VERSION b/samples/client/petstore/java/webclient/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/java/webclient/.openapi-generator/VERSION +++ b/samples/client/petstore/java/webclient/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/javascript-es6/.openapi-generator/VERSION b/samples/client/petstore/javascript-es6/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/javascript-es6/.openapi-generator/VERSION +++ b/samples/client/petstore/javascript-es6/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/javascript-promise-es6/.openapi-generator/VERSION b/samples/client/petstore/javascript-promise-es6/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/javascript-promise-es6/.openapi-generator/VERSION +++ b/samples/client/petstore/javascript-promise-es6/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/kotlin-gson/.openapi-generator/VERSION b/samples/client/petstore/kotlin-gson/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/kotlin-gson/.openapi-generator/VERSION +++ b/samples/client/petstore/kotlin-gson/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/kotlin-jackson/.openapi-generator/VERSION b/samples/client/petstore/kotlin-jackson/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/kotlin-jackson/.openapi-generator/VERSION +++ b/samples/client/petstore/kotlin-jackson/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/kotlin-json-request-string/.openapi-generator/VERSION b/samples/client/petstore/kotlin-json-request-string/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/kotlin-json-request-string/.openapi-generator/VERSION +++ b/samples/client/petstore/kotlin-json-request-string/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/.openapi-generator/VERSION b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/.openapi-generator/VERSION +++ b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/kotlin-moshi-codegen/.openapi-generator/VERSION b/samples/client/petstore/kotlin-moshi-codegen/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/kotlin-moshi-codegen/.openapi-generator/VERSION +++ b/samples/client/petstore/kotlin-moshi-codegen/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/kotlin-multiplatform/.openapi-generator/VERSION b/samples/client/petstore/kotlin-multiplatform/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/kotlin-multiplatform/.openapi-generator/VERSION +++ b/samples/client/petstore/kotlin-multiplatform/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/kotlin-nonpublic/.openapi-generator/VERSION b/samples/client/petstore/kotlin-nonpublic/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/kotlin-nonpublic/.openapi-generator/VERSION +++ b/samples/client/petstore/kotlin-nonpublic/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/kotlin-nullable/.openapi-generator/VERSION b/samples/client/petstore/kotlin-nullable/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/kotlin-nullable/.openapi-generator/VERSION +++ b/samples/client/petstore/kotlin-nullable/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/kotlin-okhttp3/.openapi-generator/VERSION b/samples/client/petstore/kotlin-okhttp3/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/kotlin-okhttp3/.openapi-generator/VERSION +++ b/samples/client/petstore/kotlin-okhttp3/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/kotlin-retrofit2-kotlinx_serialization/.openapi-generator/VERSION b/samples/client/petstore/kotlin-retrofit2-kotlinx_serialization/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/kotlin-retrofit2-kotlinx_serialization/.openapi-generator/VERSION +++ b/samples/client/petstore/kotlin-retrofit2-kotlinx_serialization/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/kotlin-retrofit2-rx3/.openapi-generator/VERSION b/samples/client/petstore/kotlin-retrofit2-rx3/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/kotlin-retrofit2-rx3/.openapi-generator/VERSION +++ b/samples/client/petstore/kotlin-retrofit2-rx3/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/kotlin-retrofit2/.openapi-generator/VERSION b/samples/client/petstore/kotlin-retrofit2/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/kotlin-retrofit2/.openapi-generator/VERSION +++ b/samples/client/petstore/kotlin-retrofit2/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/kotlin-string/.openapi-generator/VERSION b/samples/client/petstore/kotlin-string/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/kotlin-string/.openapi-generator/VERSION +++ b/samples/client/petstore/kotlin-string/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/kotlin-threetenbp/.openapi-generator/VERSION b/samples/client/petstore/kotlin-threetenbp/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/kotlin-threetenbp/.openapi-generator/VERSION +++ b/samples/client/petstore/kotlin-threetenbp/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/kotlin-uppercase-enum/.openapi-generator/VERSION b/samples/client/petstore/kotlin-uppercase-enum/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/kotlin-uppercase-enum/.openapi-generator/VERSION +++ b/samples/client/petstore/kotlin-uppercase-enum/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/kotlin/.openapi-generator/VERSION b/samples/client/petstore/kotlin/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/kotlin/.openapi-generator/VERSION +++ b/samples/client/petstore/kotlin/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/lua/.openapi-generator/VERSION b/samples/client/petstore/lua/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/lua/.openapi-generator/VERSION +++ b/samples/client/petstore/lua/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/nim/.openapi-generator/VERSION b/samples/client/petstore/nim/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/nim/.openapi-generator/VERSION +++ b/samples/client/petstore/nim/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/objc/core-data/.openapi-generator/VERSION b/samples/client/petstore/objc/core-data/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/objc/core-data/.openapi-generator/VERSION +++ b/samples/client/petstore/objc/core-data/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/objc/default/.openapi-generator/VERSION b/samples/client/petstore/objc/default/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/objc/default/.openapi-generator/VERSION +++ b/samples/client/petstore/objc/default/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/perl/.openapi-generator/VERSION b/samples/client/petstore/perl/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/perl/.openapi-generator/VERSION +++ b/samples/client/petstore/perl/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/php/OpenAPIClient-php/.openapi-generator/VERSION b/samples/client/petstore/php/OpenAPIClient-php/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/.openapi-generator/VERSION +++ b/samples/client/petstore/php/OpenAPIClient-php/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/AnotherFakeApi.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/AnotherFakeApi.php index fc90624b4df..e274c49defd 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/AnotherFakeApi.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/AnotherFakeApi.php @@ -16,11 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech -<<<<<<< HEAD * OpenAPI Generator version: 6.0.0-SNAPSHOT -======= - * OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/DefaultApi.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/DefaultApi.php index 50c39e12a57..c34fe66e69e 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/DefaultApi.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/DefaultApi.php @@ -16,11 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech -<<<<<<< HEAD * OpenAPI Generator version: 6.0.0-SNAPSHOT -======= - * OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/FakeApi.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/FakeApi.php index 61f7633e202..320300ad038 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/FakeApi.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/FakeApi.php @@ -16,11 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech -<<<<<<< HEAD * OpenAPI Generator version: 6.0.0-SNAPSHOT -======= - * OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/FakeClassnameTags123Api.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/FakeClassnameTags123Api.php index 4ca760e8333..3a839b44195 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/FakeClassnameTags123Api.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/FakeClassnameTags123Api.php @@ -16,11 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech -<<<<<<< HEAD * OpenAPI Generator version: 6.0.0-SNAPSHOT -======= - * OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/PetApi.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/PetApi.php index e04bb268794..20a126194bc 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/PetApi.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/PetApi.php @@ -16,11 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech -<<<<<<< HEAD * OpenAPI Generator version: 6.0.0-SNAPSHOT -======= - * OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/StoreApi.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/StoreApi.php index f0a660d6705..b69d2fcad45 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/StoreApi.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/StoreApi.php @@ -16,11 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech -<<<<<<< HEAD * OpenAPI Generator version: 6.0.0-SNAPSHOT -======= - * OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/UserApi.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/UserApi.php index 6fbfe0531cb..621d0ae7e48 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/UserApi.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/UserApi.php @@ -16,11 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech -<<<<<<< HEAD * OpenAPI Generator version: 6.0.0-SNAPSHOT -======= - * OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/ApiException.php b/samples/client/petstore/php/OpenAPIClient-php/lib/ApiException.php index 8a36b391917..dbf0b74a5de 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/ApiException.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/ApiException.php @@ -16,11 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech -<<<<<<< HEAD * OpenAPI Generator version: 6.0.0-SNAPSHOT -======= - * OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Configuration.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Configuration.php index 858ade0a135..4b7cde6f651 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Configuration.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Configuration.php @@ -16,11 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech -<<<<<<< HEAD * OpenAPI Generator version: 6.0.0-SNAPSHOT -======= - * OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/HeaderSelector.php b/samples/client/petstore/php/OpenAPIClient-php/lib/HeaderSelector.php index 2753d49f2ca..b581653f899 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/HeaderSelector.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/HeaderSelector.php @@ -16,11 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech -<<<<<<< HEAD * OpenAPI Generator version: 6.0.0-SNAPSHOT -======= - * OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesClass.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesClass.php index a81b16b161f..c683523db47 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesClass.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesClass.php @@ -17,11 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech -<<<<<<< HEAD * OpenAPI Generator version: 6.0.0-SNAPSHOT -======= - * OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Animal.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Animal.php index face3590373..72f96cc82ef 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Animal.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Animal.php @@ -17,11 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech -<<<<<<< HEAD * OpenAPI Generator version: 6.0.0-SNAPSHOT -======= - * OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ApiResponse.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ApiResponse.php index 089f017d0a1..578f3dcf4fd 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ApiResponse.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ApiResponse.php @@ -17,11 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech -<<<<<<< HEAD * OpenAPI Generator version: 6.0.0-SNAPSHOT -======= - * OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfArrayOfNumberOnly.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfArrayOfNumberOnly.php index 7f8483a0143..b34e160fe4a 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfArrayOfNumberOnly.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfArrayOfNumberOnly.php @@ -17,11 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech -<<<<<<< HEAD * OpenAPI Generator version: 6.0.0-SNAPSHOT -======= - * OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfNumberOnly.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfNumberOnly.php index fd62de9d944..b6c852835fa 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfNumberOnly.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfNumberOnly.php @@ -17,11 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech -<<<<<<< HEAD * OpenAPI Generator version: 6.0.0-SNAPSHOT -======= - * OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayTest.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayTest.php index 5f43ff20946..926094ca886 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayTest.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayTest.php @@ -17,11 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech -<<<<<<< HEAD * OpenAPI Generator version: 6.0.0-SNAPSHOT -======= - * OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Capitalization.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Capitalization.php index 497a311f92e..f7529adcd39 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Capitalization.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Capitalization.php @@ -17,11 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech -<<<<<<< HEAD * OpenAPI Generator version: 6.0.0-SNAPSHOT -======= - * OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Cat.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Cat.php index bc612bfeec9..1942a63cc90 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Cat.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Cat.php @@ -17,11 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech -<<<<<<< HEAD * OpenAPI Generator version: 6.0.0-SNAPSHOT -======= - * OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/CatAllOf.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/CatAllOf.php index 3659234edfd..6d34416801b 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/CatAllOf.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/CatAllOf.php @@ -17,11 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech -<<<<<<< HEAD * OpenAPI Generator version: 6.0.0-SNAPSHOT -======= - * OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Category.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Category.php index dbb76598cf6..80fd93f2298 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Category.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Category.php @@ -17,11 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech -<<<<<<< HEAD * OpenAPI Generator version: 6.0.0-SNAPSHOT -======= - * OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ClassModel.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ClassModel.php index 64383103d1d..7248264909b 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ClassModel.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ClassModel.php @@ -17,11 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech -<<<<<<< HEAD * OpenAPI Generator version: 6.0.0-SNAPSHOT -======= - * OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Client.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Client.php index acc19883332..5cab06ef880 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Client.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Client.php @@ -17,11 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech -<<<<<<< HEAD * OpenAPI Generator version: 6.0.0-SNAPSHOT -======= - * OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Dog.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Dog.php index ab8b1aa9fa7..ca6a91fb50e 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Dog.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Dog.php @@ -17,11 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech -<<<<<<< HEAD * OpenAPI Generator version: 6.0.0-SNAPSHOT -======= - * OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/DogAllOf.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/DogAllOf.php index 6b70a19af97..2c833dfd94a 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/DogAllOf.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/DogAllOf.php @@ -17,11 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech -<<<<<<< HEAD * OpenAPI Generator version: 6.0.0-SNAPSHOT -======= - * OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumArrays.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumArrays.php index 3a24aadf25d..cce2b822f17 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumArrays.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumArrays.php @@ -17,11 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech -<<<<<<< HEAD * OpenAPI Generator version: 6.0.0-SNAPSHOT -======= - * OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumClass.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumClass.php index 4b886dd3a37..e73d0a55fe0 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumClass.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumClass.php @@ -17,11 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech -<<<<<<< HEAD * OpenAPI Generator version: 6.0.0-SNAPSHOT -======= - * OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumTest.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumTest.php index 5fb88686006..a9eaba5ffc3 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumTest.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumTest.php @@ -17,11 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech -<<<<<<< HEAD * OpenAPI Generator version: 6.0.0-SNAPSHOT -======= - * OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/File.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/File.php index a42239cecf3..e24d5cd20d3 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/File.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/File.php @@ -17,11 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech -<<<<<<< HEAD * OpenAPI Generator version: 6.0.0-SNAPSHOT -======= - * OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/FileSchemaTestClass.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/FileSchemaTestClass.php index 904a48737cb..a93f493e584 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/FileSchemaTestClass.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/FileSchemaTestClass.php @@ -17,11 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech -<<<<<<< HEAD * OpenAPI Generator version: 6.0.0-SNAPSHOT -======= - * OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Foo.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Foo.php index 49f6dcc28de..ca94f928380 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Foo.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Foo.php @@ -17,11 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech -<<<<<<< HEAD * OpenAPI Generator version: 6.0.0-SNAPSHOT -======= - * OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/FormatTest.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/FormatTest.php index 699c545750c..11945dd803f 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/FormatTest.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/FormatTest.php @@ -17,11 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech -<<<<<<< HEAD * OpenAPI Generator version: 6.0.0-SNAPSHOT -======= - * OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/HasOnlyReadOnly.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/HasOnlyReadOnly.php index a274cde05d8..104d77da150 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/HasOnlyReadOnly.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/HasOnlyReadOnly.php @@ -17,11 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech -<<<<<<< HEAD * OpenAPI Generator version: 6.0.0-SNAPSHOT -======= - * OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/HealthCheckResult.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/HealthCheckResult.php index d2177e059b4..b5d373d06e9 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/HealthCheckResult.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/HealthCheckResult.php @@ -17,11 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech -<<<<<<< HEAD * OpenAPI Generator version: 6.0.0-SNAPSHOT -======= - * OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/InlineResponseDefault.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/InlineResponseDefault.php index e62630cb581..31094c88e47 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/InlineResponseDefault.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/InlineResponseDefault.php @@ -17,11 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech -<<<<<<< HEAD * OpenAPI Generator version: 6.0.0-SNAPSHOT -======= - * OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/MapTest.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/MapTest.php index 32291a7b956..43b66104acd 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/MapTest.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/MapTest.php @@ -17,11 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech -<<<<<<< HEAD * OpenAPI Generator version: 6.0.0-SNAPSHOT -======= - * OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/MixedPropertiesAndAdditionalPropertiesClass.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/MixedPropertiesAndAdditionalPropertiesClass.php index 34aeb340cc6..eb612fdcbcb 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/MixedPropertiesAndAdditionalPropertiesClass.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/MixedPropertiesAndAdditionalPropertiesClass.php @@ -17,11 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech -<<<<<<< HEAD * OpenAPI Generator version: 6.0.0-SNAPSHOT -======= - * OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Model200Response.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Model200Response.php index 17f6f79c100..0a31e0354bd 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Model200Response.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Model200Response.php @@ -17,11 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech -<<<<<<< HEAD * OpenAPI Generator version: 6.0.0-SNAPSHOT -======= - * OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelInterface.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelInterface.php index 18961c5d195..272493d1ab6 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelInterface.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelInterface.php @@ -17,11 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech -<<<<<<< HEAD * OpenAPI Generator version: 6.0.0-SNAPSHOT -======= - * OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelList.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelList.php index bd279888906..2ab8188521d 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelList.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelList.php @@ -17,11 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech -<<<<<<< HEAD * OpenAPI Generator version: 6.0.0-SNAPSHOT -======= - * OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelReturn.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelReturn.php index d5a94f4a277..f1b432b5afa 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelReturn.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelReturn.php @@ -17,11 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech -<<<<<<< HEAD * OpenAPI Generator version: 6.0.0-SNAPSHOT -======= - * OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Name.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Name.php index 949eb0b7735..97b77d52ce2 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Name.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Name.php @@ -17,11 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech -<<<<<<< HEAD * OpenAPI Generator version: 6.0.0-SNAPSHOT -======= - * OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/NullableClass.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/NullableClass.php index 566e042e7eb..7664b5b7db8 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/NullableClass.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/NullableClass.php @@ -17,11 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech -<<<<<<< HEAD * OpenAPI Generator version: 6.0.0-SNAPSHOT -======= - * OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/NumberOnly.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/NumberOnly.php index 91875f73c43..eb69c865e06 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/NumberOnly.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/NumberOnly.php @@ -17,11 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech -<<<<<<< HEAD * OpenAPI Generator version: 6.0.0-SNAPSHOT -======= - * OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Order.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Order.php index b855a520c6b..330f8553863 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Order.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Order.php @@ -17,11 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech -<<<<<<< HEAD * OpenAPI Generator version: 6.0.0-SNAPSHOT -======= - * OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterComposite.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterComposite.php index 666ea542fab..f107d19892e 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterComposite.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterComposite.php @@ -17,11 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech -<<<<<<< HEAD * OpenAPI Generator version: 6.0.0-SNAPSHOT -======= - * OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnum.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnum.php index 9d55484163d..dce8fcf5482 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnum.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnum.php @@ -17,11 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech -<<<<<<< HEAD * OpenAPI Generator version: 6.0.0-SNAPSHOT -======= - * OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnumDefaultValue.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnumDefaultValue.php index 20be3cbb9cb..d8a1f0d00c0 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnumDefaultValue.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnumDefaultValue.php @@ -17,11 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech -<<<<<<< HEAD * OpenAPI Generator version: 6.0.0-SNAPSHOT -======= - * OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnumInteger.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnumInteger.php index 8dc1a541174..dda213945d6 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnumInteger.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnumInteger.php @@ -17,11 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech -<<<<<<< HEAD * OpenAPI Generator version: 6.0.0-SNAPSHOT -======= - * OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnumIntegerDefaultValue.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnumIntegerDefaultValue.php index 7d46a63ed67..e0e9334622d 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnumIntegerDefaultValue.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnumIntegerDefaultValue.php @@ -17,11 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech -<<<<<<< HEAD * OpenAPI Generator version: 6.0.0-SNAPSHOT -======= - * OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterObjectWithEnumProperty.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterObjectWithEnumProperty.php index f4543fcb433..798cacdf166 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterObjectWithEnumProperty.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterObjectWithEnumProperty.php @@ -17,11 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech -<<<<<<< HEAD * OpenAPI Generator version: 6.0.0-SNAPSHOT -======= - * OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Pet.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Pet.php index 957dcdde2f5..aced8e0837f 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Pet.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Pet.php @@ -17,11 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech -<<<<<<< HEAD * OpenAPI Generator version: 6.0.0-SNAPSHOT -======= - * OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ReadOnlyFirst.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ReadOnlyFirst.php index e05a3116b65..0e23abd34f8 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ReadOnlyFirst.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ReadOnlyFirst.php @@ -17,11 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech -<<<<<<< HEAD * OpenAPI Generator version: 6.0.0-SNAPSHOT -======= - * OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/SpecialModelName.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/SpecialModelName.php index b2e810da372..7ac47a8b4f9 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/SpecialModelName.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/SpecialModelName.php @@ -17,11 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech -<<<<<<< HEAD * OpenAPI Generator version: 6.0.0-SNAPSHOT -======= - * OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Tag.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Tag.php index ef81ed203e1..5911b10ec15 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Tag.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Tag.php @@ -17,11 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech -<<<<<<< HEAD * OpenAPI Generator version: 6.0.0-SNAPSHOT -======= - * OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/User.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/User.php index 5e046821f51..11b01b255f7 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/User.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/User.php @@ -17,11 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech -<<<<<<< HEAD * OpenAPI Generator version: 6.0.0-SNAPSHOT -======= - * OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x */ /** diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/ObjectSerializer.php b/samples/client/petstore/php/OpenAPIClient-php/lib/ObjectSerializer.php index d684f740fef..7afe22cafe3 100644 --- a/samples/client/petstore/php/OpenAPIClient-php/lib/ObjectSerializer.php +++ b/samples/client/petstore/php/OpenAPIClient-php/lib/ObjectSerializer.php @@ -17,11 +17,7 @@ * * The version of the OpenAPI document: 1.0.0 * Generated by: https://openapi-generator.tech -<<<<<<< HEAD * OpenAPI Generator version: 6.0.0-SNAPSHOT -======= - * OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x */ /** diff --git a/samples/client/petstore/powershell/.openapi-generator/VERSION b/samples/client/petstore/powershell/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/powershell/.openapi-generator/VERSION +++ b/samples/client/petstore/powershell/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/python-asyncio/.openapi-generator/VERSION b/samples/client/petstore/python-asyncio/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/python-asyncio/.openapi-generator/VERSION +++ b/samples/client/petstore/python-asyncio/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/python-legacy/.openapi-generator/VERSION b/samples/client/petstore/python-legacy/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/python-legacy/.openapi-generator/VERSION +++ b/samples/client/petstore/python-legacy/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/python-tornado/.openapi-generator/VERSION b/samples/client/petstore/python-tornado/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/python-tornado/.openapi-generator/VERSION +++ b/samples/client/petstore/python-tornado/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/python/.openapi-generator/VERSION b/samples/client/petstore/python/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/python/.openapi-generator/VERSION +++ b/samples/client/petstore/python/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/python_disallowAdditionalPropertiesIfNotPresent/.openapi-generator/VERSION b/samples/client/petstore/python_disallowAdditionalPropertiesIfNotPresent/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/python_disallowAdditionalPropertiesIfNotPresent/.openapi-generator/VERSION +++ b/samples/client/petstore/python_disallowAdditionalPropertiesIfNotPresent/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/ruby-faraday/.openapi-generator/VERSION b/samples/client/petstore/ruby-faraday/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/ruby-faraday/.openapi-generator/VERSION +++ b/samples/client/petstore/ruby-faraday/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/ruby-faraday/lib/petstore.rb b/samples/client/petstore/ruby-faraday/lib/petstore.rb index df4c5ad38e7..1c0389beacd 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/api/another_fake_api.rb b/samples/client/petstore/ruby-faraday/lib/petstore/api/another_fake_api.rb index 3a1ebebc3df..1b9b1297272 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/api/another_fake_api.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/api/another_fake_api.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/api/default_api.rb b/samples/client/petstore/ruby-faraday/lib/petstore/api/default_api.rb index c7faf16f2af..2d2b7da307e 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/api/default_api.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/api/default_api.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/api/fake_api.rb b/samples/client/petstore/ruby-faraday/lib/petstore/api/fake_api.rb index 6b23171fd35..313b6037522 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/api/fake_api.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/api/fake_api.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/api/fake_classname_tags123_api.rb b/samples/client/petstore/ruby-faraday/lib/petstore/api/fake_classname_tags123_api.rb index da10052dd2a..a0f686867d9 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/api/fake_classname_tags123_api.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/api/fake_classname_tags123_api.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/api/pet_api.rb b/samples/client/petstore/ruby-faraday/lib/petstore/api/pet_api.rb index 9915beefb23..26394638556 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/api/pet_api.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/api/pet_api.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/api/store_api.rb b/samples/client/petstore/ruby-faraday/lib/petstore/api/store_api.rb index 255fa743e75..f462790c3f3 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/api/store_api.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/api/store_api.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/api/user_api.rb b/samples/client/petstore/ruby-faraday/lib/petstore/api/user_api.rb index d0d07779c90..b6827f6fc5c 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/api/user_api.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/api/user_api.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/api_client.rb b/samples/client/petstore/ruby-faraday/lib/petstore/api_client.rb index cc95a404d69..59c530b18c6 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/api_client.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/api_client.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/api_error.rb b/samples/client/petstore/ruby-faraday/lib/petstore/api_error.rb index 37f6d8fc29f..85b3bd9da06 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/api_error.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/api_error.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/configuration.rb b/samples/client/petstore/ruby-faraday/lib/petstore/configuration.rb index b892a310af0..e90211cfa17 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/configuration.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/configuration.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/additional_properties_class.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/additional_properties_class.rb index 6d5e77e7d75..ef7cdf93d9d 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/additional_properties_class.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/additional_properties_class.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/animal.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/animal.rb index be16e3cf5f4..7e22de93da5 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/animal.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/animal.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/api_response.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/api_response.rb index c20d63af0e4..031565289a0 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/api_response.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/api_response.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/array_of_array_of_number_only.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/array_of_array_of_number_only.rb index cf2dbfc8751..659e25306ce 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/array_of_array_of_number_only.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/array_of_array_of_number_only.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/array_of_number_only.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/array_of_number_only.rb index 3162510675f..c495716c118 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/array_of_number_only.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/array_of_number_only.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/array_test.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/array_test.rb index 5cee2b93325..c6ec6c1a90f 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/array_test.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/array_test.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/capitalization.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/capitalization.rb index e17c007ec1b..a89f9693501 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/capitalization.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/capitalization.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/cat.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/cat.rb index 37f256a4c8a..57cfa8343d0 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/cat.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/cat.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/cat_all_of.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/cat_all_of.rb index b440220a2ed..10be8ec0a08 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/cat_all_of.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/cat_all_of.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/category.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/category.rb index 7a49cdcda2f..ea966f177bc 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/category.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/category.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/class_model.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/class_model.rb index fb821398573..b73022da326 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/class_model.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/class_model.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/client.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/client.rb index 36d48682205..e874ebe700f 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/client.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/client.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/dog.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/dog.rb index 9787bc82bcf..7d692a46b61 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/dog.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/dog.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/dog_all_of.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/dog_all_of.rb index 646d4b556d1..7e9649319fb 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/dog_all_of.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/dog_all_of.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/enum_arrays.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/enum_arrays.rb index c19bc78f979..23580e86e68 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/enum_arrays.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/enum_arrays.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/enum_class.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/enum_class.rb index d1d43400c59..9913a456cdc 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/enum_class.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/enum_class.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/enum_test.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/enum_test.rb index 7ed6d4b365b..a972cfdb885 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/enum_test.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/enum_test.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/file.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/file.rb index 856ec3e41ea..adbf1b36756 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/file.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/file.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/file_schema_test_class.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/file_schema_test_class.rb index 235390c32da..b99cf2a5305 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/file_schema_test_class.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/file_schema_test_class.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/foo.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/foo.rb index 1727a09fdaa..9361c7a52d3 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/foo.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/foo.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/format_test.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/format_test.rb index 32adcdca86f..78da1ead1f8 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/format_test.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/format_test.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/has_only_read_only.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/has_only_read_only.rb index 90c0ce27f0b..121251962cb 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/has_only_read_only.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/has_only_read_only.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/health_check_result.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/health_check_result.rb index 5d81c3a4a70..1d3d86c5496 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/health_check_result.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/health_check_result.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/inline_response_default.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/inline_response_default.rb index 589ec6fd11c..605524a3dcd 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/inline_response_default.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/inline_response_default.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/list.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/list.rb index ec03a9ba040..86bd8d8cc3f 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/list.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/list.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/map_test.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/map_test.rb index 415b006f7ab..1c7c233056a 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/map_test.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/map_test.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/mixed_properties_and_additional_properties_class.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/mixed_properties_and_additional_properties_class.rb index ad0a4256f38..ba61734af03 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/mixed_properties_and_additional_properties_class.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/mixed_properties_and_additional_properties_class.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/model200_response.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/model200_response.rb index ebe17766a37..813d434348e 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/model200_response.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/model200_response.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/model_return.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/model_return.rb index 00e71d0b805..9b6cb8a8174 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/model_return.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/model_return.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/name.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/name.rb index c5dcdb3c6af..26019385252 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/name.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/name.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/nullable_class.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/nullable_class.rb index ca9ec495b5b..b33d22daadb 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/nullable_class.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/nullable_class.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/number_only.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/number_only.rb index 48b8d2d279f..28148b31886 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/number_only.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/number_only.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/order.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/order.rb index 40b0a9bffd9..374e7e85aff 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/order.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/order.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/outer_composite.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/outer_composite.rb index 68e655cfb1f..e0776697e63 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/outer_composite.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/outer_composite.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/outer_enum.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/outer_enum.rb index e6b496b2bf9..91902de42c8 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/outer_enum.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/outer_enum.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/outer_enum_default_value.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/outer_enum_default_value.rb index 915f78a0f66..78ea4449368 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/outer_enum_default_value.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/outer_enum_default_value.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/outer_enum_integer.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/outer_enum_integer.rb index 9a9c9a03694..ed9af6f2c46 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/outer_enum_integer.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/outer_enum_integer.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/outer_enum_integer_default_value.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/outer_enum_integer_default_value.rb index 334b0598136..f6a263dfe9d 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/outer_enum_integer_default_value.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/outer_enum_integer_default_value.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/outer_object_with_enum_property.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/outer_object_with_enum_property.rb index f5ff813d2b0..a304dc9b46c 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/outer_object_with_enum_property.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/outer_object_with_enum_property.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/pet.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/pet.rb index 35cbe40f430..68c3343d1d3 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/pet.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/pet.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/read_only_first.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/read_only_first.rb index de94c54c4ef..6c18c4ea29c 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/read_only_first.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/read_only_first.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/special_model_name.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/special_model_name.rb index 6adc47d9b5a..a2e8925d2ce 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/special_model_name.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/special_model_name.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/tag.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/tag.rb index a90d22c5ff1..a9958f7d213 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/tag.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/tag.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/user.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/user.rb index b08062f32db..f59454450b2 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/models/user.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/user.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/version.rb b/samples/client/petstore/ruby-faraday/lib/petstore/version.rb index 460e6134857..59c7e87806f 100644 --- a/samples/client/petstore/ruby-faraday/lib/petstore/version.rb +++ b/samples/client/petstore/ruby-faraday/lib/petstore/version.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby-faraday/petstore.gemspec b/samples/client/petstore/ruby-faraday/petstore.gemspec index 1e38980d8c4..814f96b310d 100644 --- a/samples/client/petstore/ruby-faraday/petstore.gemspec +++ b/samples/client/petstore/ruby-faraday/petstore.gemspec @@ -8,11 +8,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby-faraday/spec/api_client_spec.rb b/samples/client/petstore/ruby-faraday/spec/api_client_spec.rb index 7183b5e9bab..bfc71e43597 100644 --- a/samples/client/petstore/ruby-faraday/spec/api_client_spec.rb +++ b/samples/client/petstore/ruby-faraday/spec/api_client_spec.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby-faraday/spec/configuration_spec.rb b/samples/client/petstore/ruby-faraday/spec/configuration_spec.rb index b76b6cbee30..785eebfe6d6 100644 --- a/samples/client/petstore/ruby-faraday/spec/configuration_spec.rb +++ b/samples/client/petstore/ruby-faraday/spec/configuration_spec.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby-faraday/spec/spec_helper.rb b/samples/client/petstore/ruby-faraday/spec/spec_helper.rb index f85cbfd7373..d4a79a9a5be 100644 --- a/samples/client/petstore/ruby-faraday/spec/spec_helper.rb +++ b/samples/client/petstore/ruby-faraday/spec/spec_helper.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby/.openapi-generator/VERSION b/samples/client/petstore/ruby/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/ruby/.openapi-generator/VERSION +++ b/samples/client/petstore/ruby/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/ruby/lib/petstore.rb b/samples/client/petstore/ruby/lib/petstore.rb index df4c5ad38e7..1c0389beacd 100644 --- a/samples/client/petstore/ruby/lib/petstore.rb +++ b/samples/client/petstore/ruby/lib/petstore.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby/lib/petstore/api/another_fake_api.rb b/samples/client/petstore/ruby/lib/petstore/api/another_fake_api.rb index 3a1ebebc3df..1b9b1297272 100644 --- a/samples/client/petstore/ruby/lib/petstore/api/another_fake_api.rb +++ b/samples/client/petstore/ruby/lib/petstore/api/another_fake_api.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby/lib/petstore/api/default_api.rb b/samples/client/petstore/ruby/lib/petstore/api/default_api.rb index c7faf16f2af..2d2b7da307e 100644 --- a/samples/client/petstore/ruby/lib/petstore/api/default_api.rb +++ b/samples/client/petstore/ruby/lib/petstore/api/default_api.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby/lib/petstore/api/fake_api.rb b/samples/client/petstore/ruby/lib/petstore/api/fake_api.rb index 6b23171fd35..313b6037522 100644 --- a/samples/client/petstore/ruby/lib/petstore/api/fake_api.rb +++ b/samples/client/petstore/ruby/lib/petstore/api/fake_api.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby/lib/petstore/api/fake_classname_tags123_api.rb b/samples/client/petstore/ruby/lib/petstore/api/fake_classname_tags123_api.rb index da10052dd2a..a0f686867d9 100644 --- a/samples/client/petstore/ruby/lib/petstore/api/fake_classname_tags123_api.rb +++ b/samples/client/petstore/ruby/lib/petstore/api/fake_classname_tags123_api.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby/lib/petstore/api/pet_api.rb b/samples/client/petstore/ruby/lib/petstore/api/pet_api.rb index 76c9117ada7..ce4639d99fc 100644 --- a/samples/client/petstore/ruby/lib/petstore/api/pet_api.rb +++ b/samples/client/petstore/ruby/lib/petstore/api/pet_api.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby/lib/petstore/api/store_api.rb b/samples/client/petstore/ruby/lib/petstore/api/store_api.rb index db3ff6bc862..2fdcbb1e893 100644 --- a/samples/client/petstore/ruby/lib/petstore/api/store_api.rb +++ b/samples/client/petstore/ruby/lib/petstore/api/store_api.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby/lib/petstore/api/user_api.rb b/samples/client/petstore/ruby/lib/petstore/api/user_api.rb index c239ff1d9a9..ab73c19e3ff 100644 --- a/samples/client/petstore/ruby/lib/petstore/api/user_api.rb +++ b/samples/client/petstore/ruby/lib/petstore/api/user_api.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby/lib/petstore/api_client.rb b/samples/client/petstore/ruby/lib/petstore/api_client.rb index faa7f88a8bd..8b67459b3f4 100644 --- a/samples/client/petstore/ruby/lib/petstore/api_client.rb +++ b/samples/client/petstore/ruby/lib/petstore/api_client.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby/lib/petstore/api_error.rb b/samples/client/petstore/ruby/lib/petstore/api_error.rb index 37f6d8fc29f..85b3bd9da06 100644 --- a/samples/client/petstore/ruby/lib/petstore/api_error.rb +++ b/samples/client/petstore/ruby/lib/petstore/api_error.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby/lib/petstore/configuration.rb b/samples/client/petstore/ruby/lib/petstore/configuration.rb index 620e49b7a9a..e76708b33a3 100644 --- a/samples/client/petstore/ruby/lib/petstore/configuration.rb +++ b/samples/client/petstore/ruby/lib/petstore/configuration.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/additional_properties_class.rb b/samples/client/petstore/ruby/lib/petstore/models/additional_properties_class.rb index 6d5e77e7d75..ef7cdf93d9d 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/additional_properties_class.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/additional_properties_class.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/animal.rb b/samples/client/petstore/ruby/lib/petstore/models/animal.rb index be16e3cf5f4..7e22de93da5 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/animal.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/animal.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/api_response.rb b/samples/client/petstore/ruby/lib/petstore/models/api_response.rb index c20d63af0e4..031565289a0 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/api_response.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/api_response.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/array_of_array_of_number_only.rb b/samples/client/petstore/ruby/lib/petstore/models/array_of_array_of_number_only.rb index cf2dbfc8751..659e25306ce 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/array_of_array_of_number_only.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/array_of_array_of_number_only.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/array_of_number_only.rb b/samples/client/petstore/ruby/lib/petstore/models/array_of_number_only.rb index 3162510675f..c495716c118 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/array_of_number_only.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/array_of_number_only.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/array_test.rb b/samples/client/petstore/ruby/lib/petstore/models/array_test.rb index 5cee2b93325..c6ec6c1a90f 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/array_test.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/array_test.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/capitalization.rb b/samples/client/petstore/ruby/lib/petstore/models/capitalization.rb index e17c007ec1b..a89f9693501 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/capitalization.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/capitalization.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/cat.rb b/samples/client/petstore/ruby/lib/petstore/models/cat.rb index 37f256a4c8a..57cfa8343d0 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/cat.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/cat.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/cat_all_of.rb b/samples/client/petstore/ruby/lib/petstore/models/cat_all_of.rb index b440220a2ed..10be8ec0a08 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/cat_all_of.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/cat_all_of.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/category.rb b/samples/client/petstore/ruby/lib/petstore/models/category.rb index 7a49cdcda2f..ea966f177bc 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/category.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/category.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/class_model.rb b/samples/client/petstore/ruby/lib/petstore/models/class_model.rb index fb821398573..b73022da326 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/class_model.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/class_model.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/client.rb b/samples/client/petstore/ruby/lib/petstore/models/client.rb index 36d48682205..e874ebe700f 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/client.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/client.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/dog.rb b/samples/client/petstore/ruby/lib/petstore/models/dog.rb index 9787bc82bcf..7d692a46b61 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/dog.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/dog.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/dog_all_of.rb b/samples/client/petstore/ruby/lib/petstore/models/dog_all_of.rb index 646d4b556d1..7e9649319fb 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/dog_all_of.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/dog_all_of.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/enum_arrays.rb b/samples/client/petstore/ruby/lib/petstore/models/enum_arrays.rb index c19bc78f979..23580e86e68 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/enum_arrays.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/enum_arrays.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/enum_class.rb b/samples/client/petstore/ruby/lib/petstore/models/enum_class.rb index d1d43400c59..9913a456cdc 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/enum_class.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/enum_class.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/enum_test.rb b/samples/client/petstore/ruby/lib/petstore/models/enum_test.rb index 7ed6d4b365b..a972cfdb885 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/enum_test.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/enum_test.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/file.rb b/samples/client/petstore/ruby/lib/petstore/models/file.rb index 856ec3e41ea..adbf1b36756 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/file.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/file.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/file_schema_test_class.rb b/samples/client/petstore/ruby/lib/petstore/models/file_schema_test_class.rb index 235390c32da..b99cf2a5305 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/file_schema_test_class.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/file_schema_test_class.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/foo.rb b/samples/client/petstore/ruby/lib/petstore/models/foo.rb index 1727a09fdaa..9361c7a52d3 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/foo.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/foo.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/format_test.rb b/samples/client/petstore/ruby/lib/petstore/models/format_test.rb index 32adcdca86f..78da1ead1f8 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/format_test.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/format_test.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/has_only_read_only.rb b/samples/client/petstore/ruby/lib/petstore/models/has_only_read_only.rb index 90c0ce27f0b..121251962cb 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/has_only_read_only.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/has_only_read_only.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/health_check_result.rb b/samples/client/petstore/ruby/lib/petstore/models/health_check_result.rb index 5d81c3a4a70..1d3d86c5496 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/health_check_result.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/health_check_result.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/inline_response_default.rb b/samples/client/petstore/ruby/lib/petstore/models/inline_response_default.rb index 589ec6fd11c..605524a3dcd 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/inline_response_default.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/inline_response_default.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/list.rb b/samples/client/petstore/ruby/lib/petstore/models/list.rb index ec03a9ba040..86bd8d8cc3f 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/list.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/list.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/map_test.rb b/samples/client/petstore/ruby/lib/petstore/models/map_test.rb index 415b006f7ab..1c7c233056a 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/map_test.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/map_test.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/mixed_properties_and_additional_properties_class.rb b/samples/client/petstore/ruby/lib/petstore/models/mixed_properties_and_additional_properties_class.rb index ad0a4256f38..ba61734af03 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/mixed_properties_and_additional_properties_class.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/mixed_properties_and_additional_properties_class.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/model200_response.rb b/samples/client/petstore/ruby/lib/petstore/models/model200_response.rb index ebe17766a37..813d434348e 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/model200_response.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/model200_response.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/model_return.rb b/samples/client/petstore/ruby/lib/petstore/models/model_return.rb index 00e71d0b805..9b6cb8a8174 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/model_return.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/model_return.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/name.rb b/samples/client/petstore/ruby/lib/petstore/models/name.rb index c5dcdb3c6af..26019385252 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/name.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/name.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/nullable_class.rb b/samples/client/petstore/ruby/lib/petstore/models/nullable_class.rb index ca9ec495b5b..b33d22daadb 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/nullable_class.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/nullable_class.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/number_only.rb b/samples/client/petstore/ruby/lib/petstore/models/number_only.rb index 48b8d2d279f..28148b31886 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/number_only.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/number_only.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/order.rb b/samples/client/petstore/ruby/lib/petstore/models/order.rb index 40b0a9bffd9..374e7e85aff 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/order.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/order.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/outer_composite.rb b/samples/client/petstore/ruby/lib/petstore/models/outer_composite.rb index 68e655cfb1f..e0776697e63 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/outer_composite.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/outer_composite.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/outer_enum.rb b/samples/client/petstore/ruby/lib/petstore/models/outer_enum.rb index e6b496b2bf9..91902de42c8 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/outer_enum.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/outer_enum.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/outer_enum_default_value.rb b/samples/client/petstore/ruby/lib/petstore/models/outer_enum_default_value.rb index 915f78a0f66..78ea4449368 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/outer_enum_default_value.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/outer_enum_default_value.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/outer_enum_integer.rb b/samples/client/petstore/ruby/lib/petstore/models/outer_enum_integer.rb index 9a9c9a03694..ed9af6f2c46 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/outer_enum_integer.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/outer_enum_integer.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/outer_enum_integer_default_value.rb b/samples/client/petstore/ruby/lib/petstore/models/outer_enum_integer_default_value.rb index 334b0598136..f6a263dfe9d 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/outer_enum_integer_default_value.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/outer_enum_integer_default_value.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/outer_object_with_enum_property.rb b/samples/client/petstore/ruby/lib/petstore/models/outer_object_with_enum_property.rb index f5ff813d2b0..a304dc9b46c 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/outer_object_with_enum_property.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/outer_object_with_enum_property.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/pet.rb b/samples/client/petstore/ruby/lib/petstore/models/pet.rb index 35cbe40f430..68c3343d1d3 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/pet.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/pet.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/read_only_first.rb b/samples/client/petstore/ruby/lib/petstore/models/read_only_first.rb index de94c54c4ef..6c18c4ea29c 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/read_only_first.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/read_only_first.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/special_model_name.rb b/samples/client/petstore/ruby/lib/petstore/models/special_model_name.rb index 6adc47d9b5a..a2e8925d2ce 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/special_model_name.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/special_model_name.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/tag.rb b/samples/client/petstore/ruby/lib/petstore/models/tag.rb index a90d22c5ff1..a9958f7d213 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/tag.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/tag.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/user.rb b/samples/client/petstore/ruby/lib/petstore/models/user.rb index b08062f32db..f59454450b2 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/user.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/user.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby/lib/petstore/version.rb b/samples/client/petstore/ruby/lib/petstore/version.rb index 460e6134857..59c7e87806f 100644 --- a/samples/client/petstore/ruby/lib/petstore/version.rb +++ b/samples/client/petstore/ruby/lib/petstore/version.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby/petstore.gemspec b/samples/client/petstore/ruby/petstore.gemspec index 60bacbe7d49..0d15140ae09 100644 --- a/samples/client/petstore/ruby/petstore.gemspec +++ b/samples/client/petstore/ruby/petstore.gemspec @@ -8,11 +8,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby/spec/api_client_spec.rb b/samples/client/petstore/ruby/spec/api_client_spec.rb index f487e3eb58b..17a12f2b635 100644 --- a/samples/client/petstore/ruby/spec/api_client_spec.rb +++ b/samples/client/petstore/ruby/spec/api_client_spec.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby/spec/configuration_spec.rb b/samples/client/petstore/ruby/spec/configuration_spec.rb index b76b6cbee30..785eebfe6d6 100644 --- a/samples/client/petstore/ruby/spec/configuration_spec.rb +++ b/samples/client/petstore/ruby/spec/configuration_spec.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/ruby/spec/spec_helper.rb b/samples/client/petstore/ruby/spec/spec_helper.rb index f85cbfd7373..d4a79a9a5be 100644 --- a/samples/client/petstore/ruby/spec/spec_helper.rb +++ b/samples/client/petstore/ruby/spec/spec_helper.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/client/petstore/rust/hyper/petstore/.openapi-generator/VERSION b/samples/client/petstore/rust/hyper/petstore/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/rust/hyper/petstore/.openapi-generator/VERSION +++ b/samples/client/petstore/rust/hyper/petstore/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/rust/reqwest/petstore-async/.openapi-generator/VERSION b/samples/client/petstore/rust/reqwest/petstore-async/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/rust/reqwest/petstore-async/.openapi-generator/VERSION +++ b/samples/client/petstore/rust/reqwest/petstore-async/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/rust/reqwest/petstore/.openapi-generator/VERSION b/samples/client/petstore/rust/reqwest/petstore/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/rust/reqwest/petstore/.openapi-generator/VERSION +++ b/samples/client/petstore/rust/reqwest/petstore/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/scala-akka/.openapi-generator/VERSION b/samples/client/petstore/scala-akka/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/scala-akka/.openapi-generator/VERSION +++ b/samples/client/petstore/scala-akka/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/scala-httpclient-deprecated/.openapi-generator/VERSION b/samples/client/petstore/scala-httpclient-deprecated/.openapi-generator/VERSION index 4b448de535c..5f68295fc19 100644 --- a/samples/client/petstore/scala-httpclient-deprecated/.openapi-generator/VERSION +++ b/samples/client/petstore/scala-httpclient-deprecated/.openapi-generator/VERSION @@ -1 +1 @@ -5.3.0-SNAPSHOT \ No newline at end of file +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/scala-sttp/.openapi-generator/VERSION b/samples/client/petstore/scala-sttp/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/scala-sttp/.openapi-generator/VERSION +++ b/samples/client/petstore/scala-sttp/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/spring-cloud-async/.openapi-generator/VERSION b/samples/client/petstore/spring-cloud-async/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/spring-cloud-async/.openapi-generator/VERSION +++ b/samples/client/petstore/spring-cloud-async/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/PetApi.java b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/PetApi.java index e52921530ee..c677ea9ac0d 100644 --- a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/PetApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/StoreApi.java b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/StoreApi.java index d6891577a1f..d6a4be0e7c1 100644 --- a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/StoreApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/UserApi.java b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/UserApi.java index 46bdca806be..f2a54b8b12d 100644 --- a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/UserApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/spring-cloud-no-nullable/.openapi-generator/VERSION b/samples/client/petstore/spring-cloud-no-nullable/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/spring-cloud-no-nullable/.openapi-generator/VERSION +++ b/samples/client/petstore/spring-cloud-no-nullable/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/spring-cloud-no-nullable/src/main/java/org/openapitools/api/PetApi.java b/samples/client/petstore/spring-cloud-no-nullable/src/main/java/org/openapitools/api/PetApi.java index b97e3113c7f..89decbf82ea 100644 --- a/samples/client/petstore/spring-cloud-no-nullable/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/client/petstore/spring-cloud-no-nullable/src/main/java/org/openapitools/api/PetApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/spring-cloud-no-nullable/src/main/java/org/openapitools/api/StoreApi.java b/samples/client/petstore/spring-cloud-no-nullable/src/main/java/org/openapitools/api/StoreApi.java index 00e115beae3..c6ce94145ab 100644 --- a/samples/client/petstore/spring-cloud-no-nullable/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/client/petstore/spring-cloud-no-nullable/src/main/java/org/openapitools/api/StoreApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/spring-cloud-no-nullable/src/main/java/org/openapitools/api/UserApi.java b/samples/client/petstore/spring-cloud-no-nullable/src/main/java/org/openapitools/api/UserApi.java index 2bc17cffa3d..f237b4d0866 100644 --- a/samples/client/petstore/spring-cloud-no-nullable/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/client/petstore/spring-cloud-no-nullable/src/main/java/org/openapitools/api/UserApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/spring-cloud-spring-pageable/.openapi-generator/VERSION b/samples/client/petstore/spring-cloud-spring-pageable/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/spring-cloud-spring-pageable/.openapi-generator/VERSION +++ b/samples/client/petstore/spring-cloud-spring-pageable/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/PetApi.java b/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/PetApi.java index 0dd8dfabef1..2c7192cf68d 100644 --- a/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/PetApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java b/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java index f558be7f66a..7ae36b7b13c 100644 --- a/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/UserApi.java b/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/UserApi.java index 777302ffa21..1eb79e642e7 100644 --- a/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/api/UserApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/spring-cloud/.openapi-generator/VERSION b/samples/client/petstore/spring-cloud/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/spring-cloud/.openapi-generator/VERSION +++ b/samples/client/petstore/spring-cloud/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/PetApi.java b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/PetApi.java index b97e3113c7f..89decbf82ea 100644 --- a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/PetApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java index 00e115beae3..c6ce94145ab 100644 --- a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/UserApi.java b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/UserApi.java index 2bc17cffa3d..f237b4d0866 100644 --- a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/UserApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/spring-stubs/.openapi-generator/VERSION b/samples/client/petstore/spring-stubs/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/spring-stubs/.openapi-generator/VERSION +++ b/samples/client/petstore/spring-stubs/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/PetApi.java b/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/PetApi.java index c568685ec20..6b2cb5666f4 100644 --- a/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/PetApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/StoreApi.java b/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/StoreApi.java index aca7bc44064..a002e472853 100644 --- a/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/StoreApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/UserApi.java b/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/UserApi.java index f057e05f8c6..225a00aa60a 100644 --- a/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/client/petstore/spring-stubs/src/main/java/org/openapitools/api/UserApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/client/petstore/swift5/alamofireLibrary/.openapi-generator/VERSION b/samples/client/petstore/swift5/alamofireLibrary/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/swift5/alamofireLibrary/.openapi-generator/VERSION +++ b/samples/client/petstore/swift5/alamofireLibrary/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/swift5/combineLibrary/.openapi-generator/VERSION b/samples/client/petstore/swift5/combineLibrary/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/swift5/combineLibrary/.openapi-generator/VERSION +++ b/samples/client/petstore/swift5/combineLibrary/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/swift5/default/.openapi-generator/VERSION b/samples/client/petstore/swift5/default/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/swift5/default/.openapi-generator/VERSION +++ b/samples/client/petstore/swift5/default/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/swift5/deprecated/.openapi-generator/VERSION b/samples/client/petstore/swift5/deprecated/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/swift5/deprecated/.openapi-generator/VERSION +++ b/samples/client/petstore/swift5/deprecated/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/swift5/nonPublicApi/.openapi-generator/VERSION b/samples/client/petstore/swift5/nonPublicApi/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/swift5/nonPublicApi/.openapi-generator/VERSION +++ b/samples/client/petstore/swift5/nonPublicApi/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/swift5/objcCompatible/.openapi-generator/VERSION b/samples/client/petstore/swift5/objcCompatible/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/swift5/objcCompatible/.openapi-generator/VERSION +++ b/samples/client/petstore/swift5/objcCompatible/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/swift5/oneOf/.openapi-generator/VERSION b/samples/client/petstore/swift5/oneOf/.openapi-generator/VERSION index 4b448de535c..5f68295fc19 100644 --- a/samples/client/petstore/swift5/oneOf/.openapi-generator/VERSION +++ b/samples/client/petstore/swift5/oneOf/.openapi-generator/VERSION @@ -1 +1 @@ -5.3.0-SNAPSHOT \ No newline at end of file +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/swift5/promisekitLibrary/.openapi-generator/VERSION b/samples/client/petstore/swift5/promisekitLibrary/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/swift5/promisekitLibrary/.openapi-generator/VERSION +++ b/samples/client/petstore/swift5/promisekitLibrary/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/swift5/readonlyProperties/.openapi-generator/VERSION b/samples/client/petstore/swift5/readonlyProperties/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/swift5/readonlyProperties/.openapi-generator/VERSION +++ b/samples/client/petstore/swift5/readonlyProperties/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/swift5/resultLibrary/.openapi-generator/VERSION b/samples/client/petstore/swift5/resultLibrary/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/swift5/resultLibrary/.openapi-generator/VERSION +++ b/samples/client/petstore/swift5/resultLibrary/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/swift5/rxswiftLibrary/.openapi-generator/VERSION b/samples/client/petstore/swift5/rxswiftLibrary/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/swift5/rxswiftLibrary/.openapi-generator/VERSION +++ b/samples/client/petstore/swift5/rxswiftLibrary/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/swift5/urlsessionLibrary/.openapi-generator/VERSION b/samples/client/petstore/swift5/urlsessionLibrary/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/swift5/urlsessionLibrary/.openapi-generator/VERSION +++ b/samples/client/petstore/swift5/urlsessionLibrary/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/swift5/vaporLibrary/.openapi-generator/VERSION b/samples/client/petstore/swift5/vaporLibrary/.openapi-generator/VERSION index 4b448de535c..5f68295fc19 100644 --- a/samples/client/petstore/swift5/vaporLibrary/.openapi-generator/VERSION +++ b/samples/client/petstore/swift5/vaporLibrary/.openapi-generator/VERSION @@ -1 +1 @@ -5.3.0-SNAPSHOT \ No newline at end of file +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/swift5/x-swift-hashable/.openapi-generator/VERSION b/samples/client/petstore/swift5/x-swift-hashable/.openapi-generator/VERSION index 4b448de535c..5f68295fc19 100644 --- a/samples/client/petstore/swift5/x-swift-hashable/.openapi-generator/VERSION +++ b/samples/client/petstore/swift5/x-swift-hashable/.openapi-generator/VERSION @@ -1 +1 @@ -5.3.0-SNAPSHOT \ No newline at end of file +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/typescript-angular-v10-provided-in-root/builds/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v10-provided-in-root/builds/default/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/typescript-angular-v10-provided-in-root/builds/default/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-angular-v10-provided-in-root/builds/default/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/typescript-angular-v10-provided-in-root/builds/with-npm/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v10-provided-in-root/builds/with-npm/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/typescript-angular-v10-provided-in-root/builds/with-npm/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-angular-v10-provided-in-root/builds/with-npm/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/typescript-angular-v11-oneOf/builds/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v11-oneOf/builds/default/.openapi-generator/VERSION index 4b448de535c..5f68295fc19 100644 --- a/samples/client/petstore/typescript-angular-v11-oneOf/builds/default/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-angular-v11-oneOf/builds/default/.openapi-generator/VERSION @@ -1 +1 @@ -5.3.0-SNAPSHOT \ No newline at end of file +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/typescript-angular-v11-provided-in-root/builds/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v11-provided-in-root/builds/default/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/typescript-angular-v11-provided-in-root/builds/default/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-angular-v11-provided-in-root/builds/default/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/typescript-angular-v11-provided-in-root/builds/with-npm/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v11-provided-in-root/builds/with-npm/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/typescript-angular-v11-provided-in-root/builds/with-npm/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-angular-v11-provided-in-root/builds/with-npm/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/default/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/default/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/default/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/with-npm/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/with-npm/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/with-npm/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/with-npm/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/default/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/default/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/default/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/with-npm/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/with-npm/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/with-npm/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/with-npm/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/default/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/default/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/default/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/with-npm/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/with-npm/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/with-npm/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/with-npm/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/default/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/default/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/default/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/with-npm/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/with-npm/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/with-npm/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/with-npm/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/single-request-parameter/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/single-request-parameter/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/single-request-parameter/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/single-request-parameter/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/with-npm/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/with-npm/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/with-npm/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/with-npm/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/with-prefixed-module-name/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/with-prefixed-module-name/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/with-prefixed-module-name/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/with-prefixed-module-name/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/typescript-angular-v9-provided-in-any/builds/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v9-provided-in-any/builds/default/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/typescript-angular-v9-provided-in-any/builds/default/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-angular-v9-provided-in-any/builds/default/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/typescript-angular-v9-provided-in-root/builds/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v9-provided-in-root/builds/default/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/typescript-angular-v9-provided-in-root/builds/default/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-angular-v9-provided-in-root/builds/default/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/typescript-angular-v9-provided-in-root/builds/with-npm/.openapi-generator/VERSION b/samples/client/petstore/typescript-angular-v9-provided-in-root/builds/with-npm/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/typescript-angular-v9-provided-in-root/builds/with-npm/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-angular-v9-provided-in-root/builds/with-npm/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/typescript-aurelia/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-aurelia/default/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/typescript-aurelia/default/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-aurelia/default/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/typescript-axios/builds/composed-schemas/.openapi-generator/VERSION b/samples/client/petstore/typescript-axios/builds/composed-schemas/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/typescript-axios/builds/composed-schemas/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-axios/builds/composed-schemas/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/typescript-axios/builds/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-axios/builds/default/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/typescript-axios/builds/default/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-axios/builds/default/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/typescript-axios/builds/es6-target/.openapi-generator/VERSION b/samples/client/petstore/typescript-axios/builds/es6-target/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/typescript-axios/builds/es6-target/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-axios/builds/es6-target/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/typescript-axios/builds/with-complex-headers/.openapi-generator/VERSION b/samples/client/petstore/typescript-axios/builds/with-complex-headers/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/typescript-axios/builds/with-complex-headers/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-axios/builds/with-complex-headers/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/typescript-axios/builds/with-fake-endpoints-models-for-testing-with-http-signature/.openapi-generator/VERSION b/samples/client/petstore/typescript-axios/builds/with-fake-endpoints-models-for-testing-with-http-signature/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/typescript-axios/builds/with-fake-endpoints-models-for-testing-with-http-signature/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-axios/builds/with-fake-endpoints-models-for-testing-with-http-signature/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/typescript-axios/builds/with-interfaces/.openapi-generator/VERSION b/samples/client/petstore/typescript-axios/builds/with-interfaces/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/typescript-axios/builds/with-interfaces/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-axios/builds/with-interfaces/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/.openapi-generator/VERSION b/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/typescript-axios/builds/with-npm-version/.openapi-generator/VERSION b/samples/client/petstore/typescript-axios/builds/with-npm-version/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/typescript-axios/builds/with-npm-version/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-axios/builds/with-npm-version/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/typescript-axios/builds/with-single-request-parameters/.openapi-generator/VERSION b/samples/client/petstore/typescript-axios/builds/with-single-request-parameters/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/typescript-axios/builds/with-single-request-parameters/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-axios/builds/with-single-request-parameters/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/typescript-fetch/builds/default-v3.0/.openapi-generator/VERSION b/samples/client/petstore/typescript-fetch/builds/default-v3.0/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/typescript-fetch/builds/default-v3.0/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-fetch/builds/default-v3.0/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/typescript-fetch/builds/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-fetch/builds/default/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/typescript-fetch/builds/default/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-fetch/builds/default/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/typescript-fetch/builds/enum/.openapi-generator/VERSION b/samples/client/petstore/typescript-fetch/builds/enum/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/typescript-fetch/builds/enum/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-fetch/builds/enum/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/.openapi-generator/VERSION b/samples/client/petstore/typescript-fetch/builds/es6-target/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/typescript-fetch/builds/es6-target/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-fetch/builds/es6-target/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/typescript-fetch/builds/multiple-parameters/.openapi-generator/VERSION b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/typescript-fetch/builds/multiple-parameters/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/.openapi-generator/VERSION b/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/.openapi-generator/VERSION b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/.openapi-generator/VERSION index 4b448de535c..5f68295fc19 100644 --- a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/.openapi-generator/VERSION @@ -1 +1 @@ -5.3.0-SNAPSHOT \ No newline at end of file +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/typescript-fetch/builds/typescript-three-plus/.openapi-generator/VERSION b/samples/client/petstore/typescript-fetch/builds/typescript-three-plus/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/typescript-fetch/builds/typescript-three-plus/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-fetch/builds/typescript-three-plus/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/.openapi-generator/VERSION b/samples/client/petstore/typescript-fetch/builds/with-interfaces/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/.openapi-generator/VERSION b/samples/client/petstore/typescript-fetch/builds/with-npm-version/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/typescript-fetch/builds/without-runtime-checks/.openapi-generator/VERSION b/samples/client/petstore/typescript-fetch/builds/without-runtime-checks/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/typescript-fetch/builds/without-runtime-checks/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-fetch/builds/without-runtime-checks/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/typescript-inversify/.openapi-generator/VERSION b/samples/client/petstore/typescript-inversify/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/typescript-inversify/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-inversify/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/typescript-jquery/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-jquery/default/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/typescript-jquery/default/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-jquery/default/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/typescript-jquery/npm/.openapi-generator/VERSION b/samples/client/petstore/typescript-jquery/npm/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/typescript-jquery/npm/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-jquery/npm/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/typescript-nestjs-v6-provided-in-root/builds/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-nestjs-v6-provided-in-root/builds/default/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/typescript-nestjs-v6-provided-in-root/builds/default/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-nestjs-v6-provided-in-root/builds/default/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/typescript-node/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-node/default/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/typescript-node/default/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-node/default/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/typescript-node/npm/.openapi-generator/VERSION b/samples/client/petstore/typescript-node/npm/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/typescript-node/npm/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-node/npm/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/typescript-redux-query/builds/with-npm-version/.openapi-generator/VERSION b/samples/client/petstore/typescript-redux-query/builds/with-npm-version/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/typescript-redux-query/builds/with-npm-version/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-redux-query/builds/with-npm-version/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/typescript-rxjs/builds/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-rxjs/builds/default/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/typescript-rxjs/builds/default/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-rxjs/builds/default/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/typescript-rxjs/builds/es6-target/.openapi-generator/VERSION b/samples/client/petstore/typescript-rxjs/builds/es6-target/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/typescript-rxjs/builds/es6-target/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-rxjs/builds/es6-target/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/typescript-rxjs/builds/with-npm-version/.openapi-generator/VERSION b/samples/client/petstore/typescript-rxjs/builds/with-npm-version/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/typescript-rxjs/builds/with-npm-version/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-rxjs/builds/with-npm-version/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/typescript-rxjs/builds/with-progress-subscriber/.openapi-generator/VERSION b/samples/client/petstore/typescript-rxjs/builds/with-progress-subscriber/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/client/petstore/typescript-rxjs/builds/with-progress-subscriber/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-rxjs/builds/with-progress-subscriber/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/config/petstore/protobuf-schema/.openapi-generator/VERSION b/samples/config/petstore/protobuf-schema/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/config/petstore/protobuf-schema/.openapi-generator/VERSION +++ b/samples/config/petstore/protobuf-schema/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/meta-codegen/lib/pom.xml b/samples/meta-codegen/lib/pom.xml index c13096b0a83..5d82299e91b 100644 --- a/samples/meta-codegen/lib/pom.xml +++ b/samples/meta-codegen/lib/pom.xml @@ -121,11 +121,7 @@ UTF-8 -<<<<<<< HEAD 6.0.0-SNAPSHOT -======= - 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x 1.0.0 4.8.1 diff --git a/samples/meta-codegen/usage/.openapi-generator/VERSION b/samples/meta-codegen/usage/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/meta-codegen/usage/.openapi-generator/VERSION +++ b/samples/meta-codegen/usage/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/openapi3/client/elm/.openapi-generator/VERSION b/samples/openapi3/client/elm/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/openapi3/client/elm/.openapi-generator/VERSION +++ b/samples/openapi3/client/elm/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/go-experimental/.openapi-generator/VERSION b/samples/openapi3/client/extensions/x-auth-id-alias/go-experimental/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/openapi3/client/extensions/x-auth-id-alias/go-experimental/.openapi-generator/VERSION +++ b/samples/openapi3/client/extensions/x-auth-id-alias/go-experimental/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/java/jersey2-java8/.openapi-generator/VERSION b/samples/openapi3/client/extensions/x-auth-id-alias/java/jersey2-java8/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/openapi3/client/extensions/x-auth-id-alias/java/jersey2-java8/.openapi-generator/VERSION +++ b/samples/openapi3/client/extensions/x-auth-id-alias/java/jersey2-java8/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/python/.openapi-generator/VERSION b/samples/openapi3/client/extensions/x-auth-id-alias/python/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/openapi3/client/extensions/x-auth-id-alias/python/.openapi-generator/VERSION +++ b/samples/openapi3/client/extensions/x-auth-id-alias/python/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/.openapi-generator/VERSION b/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/.openapi-generator/VERSION +++ b/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/lib/x_auth_id_alias.rb b/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/lib/x_auth_id_alias.rb index 6b0cd8c3f24..6d6964932aa 100644 --- a/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/lib/x_auth_id_alias.rb +++ b/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/lib/x_auth_id_alias.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/lib/x_auth_id_alias/api/usage_api.rb b/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/lib/x_auth_id_alias/api/usage_api.rb index faa5b134f3f..4dc01f94637 100644 --- a/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/lib/x_auth_id_alias/api/usage_api.rb +++ b/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/lib/x_auth_id_alias/api/usage_api.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/lib/x_auth_id_alias/api_client.rb b/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/lib/x_auth_id_alias/api_client.rb index 2e38f9a7aa3..18182705e43 100644 --- a/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/lib/x_auth_id_alias/api_client.rb +++ b/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/lib/x_auth_id_alias/api_client.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/lib/x_auth_id_alias/api_error.rb b/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/lib/x_auth_id_alias/api_error.rb index 2d72fa80345..90a45186eea 100644 --- a/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/lib/x_auth_id_alias/api_error.rb +++ b/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/lib/x_auth_id_alias/api_error.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/lib/x_auth_id_alias/configuration.rb b/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/lib/x_auth_id_alias/configuration.rb index ddb0210f483..bb9d76c3d63 100644 --- a/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/lib/x_auth_id_alias/configuration.rb +++ b/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/lib/x_auth_id_alias/configuration.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/lib/x_auth_id_alias/version.rb b/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/lib/x_auth_id_alias/version.rb index a8ca97a68c7..66381103e77 100644 --- a/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/lib/x_auth_id_alias/version.rb +++ b/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/lib/x_auth_id_alias/version.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/spec/api_client_spec.rb b/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/spec/api_client_spec.rb index 7ff16c42a04..558b77058c7 100644 --- a/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/spec/api_client_spec.rb +++ b/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/spec/api_client_spec.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/spec/configuration_spec.rb b/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/spec/configuration_spec.rb index 34ae878d3d1..c011e31b222 100644 --- a/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/spec/configuration_spec.rb +++ b/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/spec/configuration_spec.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/spec/spec_helper.rb b/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/spec/spec_helper.rb index 46f1c4b68fb..1f191e8eb0e 100644 --- a/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/spec/spec_helper.rb +++ b/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/spec/spec_helper.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/x_auth_id_alias.gemspec b/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/x_auth_id_alias.gemspec index 376e985a334..007ed603179 100644 --- a/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/x_auth_id_alias.gemspec +++ b/samples/openapi3/client/extensions/x-auth-id-alias/ruby-client/x_auth_id_alias.gemspec @@ -8,11 +8,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/openapi3/client/features/dynamic-servers/python/.openapi-generator/VERSION b/samples/openapi3/client/features/dynamic-servers/python/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/openapi3/client/features/dynamic-servers/python/.openapi-generator/VERSION +++ b/samples/openapi3/client/features/dynamic-servers/python/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/openapi3/client/features/dynamic-servers/ruby/.openapi-generator/VERSION b/samples/openapi3/client/features/dynamic-servers/ruby/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/openapi3/client/features/dynamic-servers/ruby/.openapi-generator/VERSION +++ b/samples/openapi3/client/features/dynamic-servers/ruby/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/openapi3/client/features/dynamic-servers/ruby/dynamic_servers.gemspec b/samples/openapi3/client/features/dynamic-servers/ruby/dynamic_servers.gemspec index 5f9398cd7d0..dfe7d45dedc 100644 --- a/samples/openapi3/client/features/dynamic-servers/ruby/dynamic_servers.gemspec +++ b/samples/openapi3/client/features/dynamic-servers/ruby/dynamic_servers.gemspec @@ -8,11 +8,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/openapi3/client/features/dynamic-servers/ruby/lib/dynamic_servers.rb b/samples/openapi3/client/features/dynamic-servers/ruby/lib/dynamic_servers.rb index 3f3de89c19f..ac81bc65875 100644 --- a/samples/openapi3/client/features/dynamic-servers/ruby/lib/dynamic_servers.rb +++ b/samples/openapi3/client/features/dynamic-servers/ruby/lib/dynamic_servers.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/openapi3/client/features/dynamic-servers/ruby/lib/dynamic_servers/api/usage_api.rb b/samples/openapi3/client/features/dynamic-servers/ruby/lib/dynamic_servers/api/usage_api.rb index aca35586cf5..44ad371b1df 100644 --- a/samples/openapi3/client/features/dynamic-servers/ruby/lib/dynamic_servers/api/usage_api.rb +++ b/samples/openapi3/client/features/dynamic-servers/ruby/lib/dynamic_servers/api/usage_api.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/openapi3/client/features/dynamic-servers/ruby/lib/dynamic_servers/api_client.rb b/samples/openapi3/client/features/dynamic-servers/ruby/lib/dynamic_servers/api_client.rb index fcd2eca8f2b..d61333491f5 100644 --- a/samples/openapi3/client/features/dynamic-servers/ruby/lib/dynamic_servers/api_client.rb +++ b/samples/openapi3/client/features/dynamic-servers/ruby/lib/dynamic_servers/api_client.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/openapi3/client/features/dynamic-servers/ruby/lib/dynamic_servers/api_error.rb b/samples/openapi3/client/features/dynamic-servers/ruby/lib/dynamic_servers/api_error.rb index 6051e3abf41..42728038602 100644 --- a/samples/openapi3/client/features/dynamic-servers/ruby/lib/dynamic_servers/api_error.rb +++ b/samples/openapi3/client/features/dynamic-servers/ruby/lib/dynamic_servers/api_error.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/openapi3/client/features/dynamic-servers/ruby/lib/dynamic_servers/configuration.rb b/samples/openapi3/client/features/dynamic-servers/ruby/lib/dynamic_servers/configuration.rb index 3c20866303c..f157fa0714a 100644 --- a/samples/openapi3/client/features/dynamic-servers/ruby/lib/dynamic_servers/configuration.rb +++ b/samples/openapi3/client/features/dynamic-servers/ruby/lib/dynamic_servers/configuration.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/openapi3/client/features/dynamic-servers/ruby/lib/dynamic_servers/version.rb b/samples/openapi3/client/features/dynamic-servers/ruby/lib/dynamic_servers/version.rb index 8338974e211..0498388e6c2 100644 --- a/samples/openapi3/client/features/dynamic-servers/ruby/lib/dynamic_servers/version.rb +++ b/samples/openapi3/client/features/dynamic-servers/ruby/lib/dynamic_servers/version.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/openapi3/client/features/dynamic-servers/ruby/spec/api_client_spec.rb b/samples/openapi3/client/features/dynamic-servers/ruby/spec/api_client_spec.rb index e07d9e42019..f370745a6a5 100644 --- a/samples/openapi3/client/features/dynamic-servers/ruby/spec/api_client_spec.rb +++ b/samples/openapi3/client/features/dynamic-servers/ruby/spec/api_client_spec.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/openapi3/client/features/dynamic-servers/ruby/spec/configuration_spec.rb b/samples/openapi3/client/features/dynamic-servers/ruby/spec/configuration_spec.rb index 873083eddda..0cf4da3cbc2 100644 --- a/samples/openapi3/client/features/dynamic-servers/ruby/spec/configuration_spec.rb +++ b/samples/openapi3/client/features/dynamic-servers/ruby/spec/configuration_spec.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/openapi3/client/features/dynamic-servers/ruby/spec/spec_helper.rb b/samples/openapi3/client/features/dynamic-servers/ruby/spec/spec_helper.rb index 8d5d7e541b2..2c425b59e55 100644 --- a/samples/openapi3/client/features/dynamic-servers/ruby/spec/spec_helper.rb +++ b/samples/openapi3/client/features/dynamic-servers/ruby/spec/spec_helper.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/openapi3/client/features/generate-alias-as-model/ruby-client/.openapi-generator/VERSION b/samples/openapi3/client/features/generate-alias-as-model/ruby-client/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/openapi3/client/features/generate-alias-as-model/ruby-client/.openapi-generator/VERSION +++ b/samples/openapi3/client/features/generate-alias-as-model/ruby-client/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore.rb b/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore.rb index db7c52d5e38..65857baeb0c 100644 --- a/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore.rb +++ b/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore/api/usage_api.rb b/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore/api/usage_api.rb index 2026f933021..af0e5cba9a7 100644 --- a/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore/api/usage_api.rb +++ b/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore/api/usage_api.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore/api_client.rb b/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore/api_client.rb index 80aba24f320..18b8ee414ea 100644 --- a/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore/api_client.rb +++ b/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore/api_client.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore/api_error.rb b/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore/api_error.rb index 0c743fb9bb8..da466010b4e 100644 --- a/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore/api_error.rb +++ b/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore/api_error.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore/configuration.rb b/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore/configuration.rb index 802ccad1482..c71bc79af69 100644 --- a/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore/configuration.rb +++ b/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore/configuration.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore/models/array_alias.rb b/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore/models/array_alias.rb index 98fa01b0566..c72355b506c 100644 --- a/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore/models/array_alias.rb +++ b/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore/models/array_alias.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore/models/map_alias.rb b/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore/models/map_alias.rb index 88b9d58c0fa..cf7fc57d9bb 100644 --- a/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore/models/map_alias.rb +++ b/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore/models/map_alias.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore/version.rb b/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore/version.rb index 57e7a26260f..df2dd7ae50a 100644 --- a/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore/version.rb +++ b/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore/version.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/openapi3/client/features/generate-alias-as-model/ruby-client/petstore.gemspec b/samples/openapi3/client/features/generate-alias-as-model/ruby-client/petstore.gemspec index f7eb2a72666..8a19b1bfcda 100644 --- a/samples/openapi3/client/features/generate-alias-as-model/ruby-client/petstore.gemspec +++ b/samples/openapi3/client/features/generate-alias-as-model/ruby-client/petstore.gemspec @@ -8,11 +8,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/openapi3/client/features/generate-alias-as-model/ruby-client/spec/api_client_spec.rb b/samples/openapi3/client/features/generate-alias-as-model/ruby-client/spec/api_client_spec.rb index dd5ab897699..1d6dbf9b5ac 100644 --- a/samples/openapi3/client/features/generate-alias-as-model/ruby-client/spec/api_client_spec.rb +++ b/samples/openapi3/client/features/generate-alias-as-model/ruby-client/spec/api_client_spec.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/openapi3/client/features/generate-alias-as-model/ruby-client/spec/configuration_spec.rb b/samples/openapi3/client/features/generate-alias-as-model/ruby-client/spec/configuration_spec.rb index 63ad6199056..9e5aa7b6f4a 100644 --- a/samples/openapi3/client/features/generate-alias-as-model/ruby-client/spec/configuration_spec.rb +++ b/samples/openapi3/client/features/generate-alias-as-model/ruby-client/spec/configuration_spec.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/openapi3/client/features/generate-alias-as-model/ruby-client/spec/spec_helper.rb b/samples/openapi3/client/features/generate-alias-as-model/ruby-client/spec/spec_helper.rb index 8744501e48e..f4974f981a3 100644 --- a/samples/openapi3/client/features/generate-alias-as-model/ruby-client/spec/spec_helper.rb +++ b/samples/openapi3/client/features/generate-alias-as-model/ruby-client/spec/spec_helper.rb @@ -6,11 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 6.0.0-SNAPSHOT -======= -OpenAPI Generator version: 5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x =end diff --git a/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/.openapi-generator/VERSION b/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib/.openapi-generator/VERSION b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/.openapi-generator/VERSION b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/openapi3/client/petstore/dart2/petstore_client_lib/.openapi-generator/VERSION b/samples/openapi3/client/petstore/dart2/petstore_client_lib/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/openapi3/client/petstore/dart2/petstore_client_lib/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/dart2/petstore_client_lib/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/.openapi-generator/VERSION b/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/openapi3/client/petstore/dart2/petstore_json_serializable_client_lib_fake/.openapi-generator/VERSION b/samples/openapi3/client/petstore/dart2/petstore_json_serializable_client_lib_fake/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/openapi3/client/petstore/dart2/petstore_json_serializable_client_lib_fake/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/dart2/petstore_json_serializable_client_lib_fake/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/openapi3/client/petstore/go/go-petstore/.openapi-generator/VERSION b/samples/openapi3/client/petstore/go/go-petstore/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/openapi3/client/petstore/go/go-petstore/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/go/go-petstore/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/.openapi-generator/VERSION b/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/.openapi-generator/VERSION b/samples/openapi3/client/petstore/java/jersey2-java8/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/java/jersey2-java8/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/openapi3/client/petstore/java/native/.openapi-generator/VERSION b/samples/openapi3/client/petstore/java/native/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/openapi3/client/petstore/java/native/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/java/native/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/openapi3/client/petstore/python-legacy/.openapi-generator/VERSION b/samples/openapi3/client/petstore/python-legacy/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100755 --- a/samples/openapi3/client/petstore/python-legacy/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/python-legacy/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/openapi3/client/petstore/python/.openapi-generator/VERSION b/samples/openapi3/client/petstore/python/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/openapi3/client/petstore/python/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/python/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/openapi3/client/petstore/typescript/builds/default/.openapi-generator/VERSION b/samples/openapi3/client/petstore/typescript/builds/default/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/openapi3/client/petstore/typescript/builds/default/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/typescript/builds/default/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/openapi3/client/petstore/typescript/builds/deno/.openapi-generator/VERSION b/samples/openapi3/client/petstore/typescript/builds/deno/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/openapi3/client/petstore/typescript/builds/deno/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/typescript/builds/deno/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/.openapi-generator/VERSION b/samples/openapi3/client/petstore/typescript/builds/inversify/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/openapi3/client/petstore/typescript/builds/inversify/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/typescript/builds/inversify/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/openapi3/client/petstore/typescript/builds/jquery/.openapi-generator/VERSION b/samples/openapi3/client/petstore/typescript/builds/jquery/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/openapi3/client/petstore/typescript/builds/jquery/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/typescript/builds/jquery/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/openapi3/client/petstore/typescript/builds/object_params/.openapi-generator/VERSION b/samples/openapi3/client/petstore/typescript/builds/object_params/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/openapi3/client/petstore/typescript/builds/object_params/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/typescript/builds/object_params/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/schema/petstore/ktorm/.openapi-generator/VERSION b/samples/schema/petstore/ktorm/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/schema/petstore/ktorm/.openapi-generator/VERSION +++ b/samples/schema/petstore/ktorm/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/schema/petstore/mysql/.openapi-generator/VERSION b/samples/schema/petstore/mysql/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/schema/petstore/mysql/.openapi-generator/VERSION +++ b/samples/schema/petstore/mysql/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/schema/petstore/wsdl-schema/.openapi-generator/VERSION b/samples/schema/petstore/wsdl-schema/.openapi-generator/VERSION index 4b448de535c..5f68295fc19 100644 --- a/samples/schema/petstore/wsdl-schema/.openapi-generator/VERSION +++ b/samples/schema/petstore/wsdl-schema/.openapi-generator/VERSION @@ -1 +1 @@ -5.3.0-SNAPSHOT \ No newline at end of file +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/aspnetcore-3.0/.openapi-generator/VERSION b/samples/server/petstore/aspnetcore-3.0/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/server/petstore/aspnetcore-3.0/.openapi-generator/VERSION +++ b/samples/server/petstore/aspnetcore-3.0/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/aspnetcore-3.1/.openapi-generator/VERSION b/samples/server/petstore/aspnetcore-3.1/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/server/petstore/aspnetcore-3.1/.openapi-generator/VERSION +++ b/samples/server/petstore/aspnetcore-3.1/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/aspnetcore-5.0/.openapi-generator/VERSION b/samples/server/petstore/aspnetcore-5.0/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/server/petstore/aspnetcore-5.0/.openapi-generator/VERSION +++ b/samples/server/petstore/aspnetcore-5.0/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/aspnetcore/.openapi-generator/VERSION b/samples/server/petstore/aspnetcore/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/server/petstore/aspnetcore/.openapi-generator/VERSION +++ b/samples/server/petstore/aspnetcore/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/cpp-pistache/.openapi-generator/VERSION b/samples/server/petstore/cpp-pistache/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/server/petstore/cpp-pistache/.openapi-generator/VERSION +++ b/samples/server/petstore/cpp-pistache/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/cpp-qt-qhttpengine-server/.openapi-generator/VERSION b/samples/server/petstore/cpp-qt-qhttpengine-server/.openapi-generator/VERSION index 4b448de535c..5f68295fc19 100644 --- a/samples/server/petstore/cpp-qt-qhttpengine-server/.openapi-generator/VERSION +++ b/samples/server/petstore/cpp-qt-qhttpengine-server/.openapi-generator/VERSION @@ -1 +1 @@ -5.3.0-SNAPSHOT \ No newline at end of file +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/erlang-server/.openapi-generator/VERSION b/samples/server/petstore/erlang-server/.openapi-generator/VERSION index 4b448de535c..5f68295fc19 100644 --- a/samples/server/petstore/erlang-server/.openapi-generator/VERSION +++ b/samples/server/petstore/erlang-server/.openapi-generator/VERSION @@ -1 +1 @@ -5.3.0-SNAPSHOT \ No newline at end of file +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/go-api-server/.openapi-generator/VERSION b/samples/server/petstore/go-api-server/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/server/petstore/go-api-server/.openapi-generator/VERSION +++ b/samples/server/petstore/go-api-server/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/go-chi-server/.openapi-generator/VERSION b/samples/server/petstore/go-chi-server/.openapi-generator/VERSION index 4b448de535c..5f68295fc19 100644 --- a/samples/server/petstore/go-chi-server/.openapi-generator/VERSION +++ b/samples/server/petstore/go-chi-server/.openapi-generator/VERSION @@ -1 +1 @@ -5.3.0-SNAPSHOT \ No newline at end of file +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/go-echo-server/.openapi-generator/VERSION b/samples/server/petstore/go-echo-server/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/server/petstore/go-echo-server/.openapi-generator/VERSION +++ b/samples/server/petstore/go-echo-server/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/go-gin-api-server/.openapi-generator/VERSION b/samples/server/petstore/go-gin-api-server/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/server/petstore/go-gin-api-server/.openapi-generator/VERSION +++ b/samples/server/petstore/go-gin-api-server/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/haskell-servant/.openapi-generator/VERSION b/samples/server/petstore/haskell-servant/.openapi-generator/VERSION index 4b448de535c..5f68295fc19 100644 --- a/samples/server/petstore/haskell-servant/.openapi-generator/VERSION +++ b/samples/server/petstore/haskell-servant/.openapi-generator/VERSION @@ -1 +1 @@ -5.3.0-SNAPSHOT \ No newline at end of file +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/java-msf4j/.openapi-generator/VERSION b/samples/server/petstore/java-msf4j/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/server/petstore/java-msf4j/.openapi-generator/VERSION +++ b/samples/server/petstore/java-msf4j/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/java-play-framework-api-package-override/.openapi-generator/VERSION b/samples/server/petstore/java-play-framework-api-package-override/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/server/petstore/java-play-framework-api-package-override/.openapi-generator/VERSION +++ b/samples/server/petstore/java-play-framework-api-package-override/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/java-play-framework-async/.openapi-generator/VERSION b/samples/server/petstore/java-play-framework-async/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/server/petstore/java-play-framework-async/.openapi-generator/VERSION +++ b/samples/server/petstore/java-play-framework-async/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/java-play-framework-controller-only/.openapi-generator/VERSION b/samples/server/petstore/java-play-framework-controller-only/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/server/petstore/java-play-framework-controller-only/.openapi-generator/VERSION +++ b/samples/server/petstore/java-play-framework-controller-only/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/.openapi-generator/VERSION b/samples/server/petstore/java-play-framework-fake-endpoints/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints/.openapi-generator/VERSION +++ b/samples/server/petstore/java-play-framework-fake-endpoints/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/java-play-framework-no-bean-validation/.openapi-generator/VERSION b/samples/server/petstore/java-play-framework-no-bean-validation/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/server/petstore/java-play-framework-no-bean-validation/.openapi-generator/VERSION +++ b/samples/server/petstore/java-play-framework-no-bean-validation/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/java-play-framework-no-exception-handling/.openapi-generator/VERSION b/samples/server/petstore/java-play-framework-no-exception-handling/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/server/petstore/java-play-framework-no-exception-handling/.openapi-generator/VERSION +++ b/samples/server/petstore/java-play-framework-no-exception-handling/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/java-play-framework-no-interface/.openapi-generator/VERSION b/samples/server/petstore/java-play-framework-no-interface/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/server/petstore/java-play-framework-no-interface/.openapi-generator/VERSION +++ b/samples/server/petstore/java-play-framework-no-interface/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/java-play-framework-no-nullable/.openapi-generator/VERSION b/samples/server/petstore/java-play-framework-no-nullable/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/server/petstore/java-play-framework-no-nullable/.openapi-generator/VERSION +++ b/samples/server/petstore/java-play-framework-no-nullable/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/java-play-framework-no-swagger-ui/.openapi-generator/VERSION b/samples/server/petstore/java-play-framework-no-swagger-ui/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/server/petstore/java-play-framework-no-swagger-ui/.openapi-generator/VERSION +++ b/samples/server/petstore/java-play-framework-no-swagger-ui/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/java-play-framework-no-wrap-calls/.openapi-generator/VERSION b/samples/server/petstore/java-play-framework-no-wrap-calls/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/server/petstore/java-play-framework-no-wrap-calls/.openapi-generator/VERSION +++ b/samples/server/petstore/java-play-framework-no-wrap-calls/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/java-play-framework/.openapi-generator/VERSION b/samples/server/petstore/java-play-framework/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/server/petstore/java-play-framework/.openapi-generator/VERSION +++ b/samples/server/petstore/java-play-framework/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/java-undertow/.openapi-generator/VERSION b/samples/server/petstore/java-undertow/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/server/petstore/java-undertow/.openapi-generator/VERSION +++ b/samples/server/petstore/java-undertow/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/java-vertx-web/.openapi-generator/VERSION b/samples/server/petstore/java-vertx-web/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/server/petstore/java-vertx-web/.openapi-generator/VERSION +++ b/samples/server/petstore/java-vertx-web/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/jaxrs-cxf-annotated-base-path/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-cxf-annotated-base-path/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/server/petstore/jaxrs-cxf-annotated-base-path/.openapi-generator/VERSION +++ b/samples/server/petstore/jaxrs-cxf-annotated-base-path/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/jaxrs-cxf-cdi-default-value/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-cxf-cdi-default-value/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/server/petstore/jaxrs-cxf-cdi-default-value/.openapi-generator/VERSION +++ b/samples/server/petstore/jaxrs-cxf-cdi-default-value/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/jaxrs-cxf-cdi/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-cxf-cdi/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/server/petstore/jaxrs-cxf-cdi/.openapi-generator/VERSION +++ b/samples/server/petstore/jaxrs-cxf-cdi/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/jaxrs-cxf-non-spring-app/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-cxf-non-spring-app/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/server/petstore/jaxrs-cxf-non-spring-app/.openapi-generator/VERSION +++ b/samples/server/petstore/jaxrs-cxf-non-spring-app/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/jaxrs-cxf/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-cxf/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/server/petstore/jaxrs-cxf/.openapi-generator/VERSION +++ b/samples/server/petstore/jaxrs-cxf/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/jaxrs-datelib-j8/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-datelib-j8/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/.openapi-generator/VERSION +++ b/samples/server/petstore/jaxrs-datelib-j8/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/jaxrs-jersey/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-jersey/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/server/petstore/jaxrs-jersey/.openapi-generator/VERSION +++ b/samples/server/petstore/jaxrs-jersey/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/jaxrs-resteasy/default-value/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-resteasy/default-value/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/server/petstore/jaxrs-resteasy/default-value/.openapi-generator/VERSION +++ b/samples/server/petstore/jaxrs-resteasy/default-value/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/jaxrs-resteasy/default/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-resteasy/default/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/server/petstore/jaxrs-resteasy/default/.openapi-generator/VERSION +++ b/samples/server/petstore/jaxrs-resteasy/default/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/jaxrs-resteasy/eap-java8/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-resteasy/eap-java8/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/server/petstore/jaxrs-resteasy/eap-java8/.openapi-generator/VERSION +++ b/samples/server/petstore/jaxrs-resteasy/eap-java8/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/jaxrs-resteasy/eap-joda/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-resteasy/eap-joda/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/server/petstore/jaxrs-resteasy/eap-joda/.openapi-generator/VERSION +++ b/samples/server/petstore/jaxrs-resteasy/eap-joda/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/jaxrs-resteasy/eap/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-resteasy/eap/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/server/petstore/jaxrs-resteasy/eap/.openapi-generator/VERSION +++ b/samples/server/petstore/jaxrs-resteasy/eap/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/jaxrs-resteasy/joda/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-resteasy/joda/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/server/petstore/jaxrs-resteasy/joda/.openapi-generator/VERSION +++ b/samples/server/petstore/jaxrs-resteasy/joda/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/jaxrs-spec-interface/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-spec-interface/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/server/petstore/jaxrs-spec-interface/.openapi-generator/VERSION +++ b/samples/server/petstore/jaxrs-spec-interface/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/jaxrs-spec/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-spec/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/server/petstore/jaxrs-spec/.openapi-generator/VERSION +++ b/samples/server/petstore/jaxrs-spec/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/jaxrs/jersey1-useTags/.openapi-generator/VERSION b/samples/server/petstore/jaxrs/jersey1-useTags/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/server/petstore/jaxrs/jersey1-useTags/.openapi-generator/VERSION +++ b/samples/server/petstore/jaxrs/jersey1-useTags/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/jaxrs/jersey1/.openapi-generator/VERSION b/samples/server/petstore/jaxrs/jersey1/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/server/petstore/jaxrs/jersey1/.openapi-generator/VERSION +++ b/samples/server/petstore/jaxrs/jersey1/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/.openapi-generator/VERSION b/samples/server/petstore/jaxrs/jersey2-useTags/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/.openapi-generator/VERSION +++ b/samples/server/petstore/jaxrs/jersey2-useTags/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/jaxrs/jersey2/.openapi-generator/VERSION b/samples/server/petstore/jaxrs/jersey2/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/server/petstore/jaxrs/jersey2/.openapi-generator/VERSION +++ b/samples/server/petstore/jaxrs/jersey2/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/kotlin-server/ktor/.openapi-generator/VERSION b/samples/server/petstore/kotlin-server/ktor/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/server/petstore/kotlin-server/ktor/.openapi-generator/VERSION +++ b/samples/server/petstore/kotlin-server/ktor/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/kotlin-server/ktor/README.md b/samples/server/petstore/kotlin-server/ktor/README.md index 6a324199804..453c47e553b 100644 --- a/samples/server/petstore/kotlin-server/ktor/README.md +++ b/samples/server/petstore/kotlin-server/ktor/README.md @@ -2,11 +2,7 @@ This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. -<<<<<<< HEAD Generated by OpenAPI Generator 6.0.0-SNAPSHOT. -======= -Generated by OpenAPI Generator 5.3.0-SNAPSHOT. ->>>>>>> origin/5.3.x ## Requires diff --git a/samples/server/petstore/kotlin-springboot-delegate/.openapi-generator/VERSION b/samples/server/petstore/kotlin-springboot-delegate/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/server/petstore/kotlin-springboot-delegate/.openapi-generator/VERSION +++ b/samples/server/petstore/kotlin-springboot-delegate/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/PetApi.kt b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/PetApi.kt index 2b3942eb2a8..3249c199588 100644 --- a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/PetApi.kt +++ b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/PetApi.kt @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/StoreApi.kt b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/StoreApi.kt index 847d715ffdc..63a1dfe5d9e 100644 --- a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/StoreApi.kt +++ b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/StoreApi.kt @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/UserApi.kt b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/UserApi.kt index cd6f99e4ca7..237efa3f58c 100644 --- a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/UserApi.kt +++ b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/UserApi.kt @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/kotlin-springboot-reactive/.openapi-generator/VERSION b/samples/server/petstore/kotlin-springboot-reactive/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/server/petstore/kotlin-springboot-reactive/.openapi-generator/VERSION +++ b/samples/server/petstore/kotlin-springboot-reactive/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/kotlin-springboot/.openapi-generator/VERSION b/samples/server/petstore/kotlin-springboot/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/server/petstore/kotlin-springboot/.openapi-generator/VERSION +++ b/samples/server/petstore/kotlin-springboot/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/php-laravel/.openapi-generator/VERSION b/samples/server/petstore/php-laravel/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/server/petstore/php-laravel/.openapi-generator/VERSION +++ b/samples/server/petstore/php-laravel/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/php-lumen/.openapi-generator/VERSION b/samples/server/petstore/php-lumen/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/server/petstore/php-lumen/.openapi-generator/VERSION +++ b/samples/server/petstore/php-lumen/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/php-mezzio-ph-modern/.openapi-generator/VERSION b/samples/server/petstore/php-mezzio-ph-modern/.openapi-generator/VERSION index 4b448de535c..5f68295fc19 100644 --- a/samples/server/petstore/php-mezzio-ph-modern/.openapi-generator/VERSION +++ b/samples/server/petstore/php-mezzio-ph-modern/.openapi-generator/VERSION @@ -1 +1 @@ -5.3.0-SNAPSHOT \ No newline at end of file +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/php-mezzio-ph/.openapi-generator/VERSION b/samples/server/petstore/php-mezzio-ph/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/server/petstore/php-mezzio-ph/.openapi-generator/VERSION +++ b/samples/server/petstore/php-mezzio-ph/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/php-slim4/.openapi-generator/VERSION b/samples/server/petstore/php-slim4/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/server/petstore/php-slim4/.openapi-generator/VERSION +++ b/samples/server/petstore/php-slim4/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/php-symfony/SymfonyBundle-php/.openapi-generator/VERSION b/samples/server/petstore/php-symfony/SymfonyBundle-php/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/server/petstore/php-symfony/SymfonyBundle-php/.openapi-generator/VERSION +++ b/samples/server/petstore/php-symfony/SymfonyBundle-php/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/python-aiohttp-srclayout/.openapi-generator/VERSION b/samples/server/petstore/python-aiohttp-srclayout/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/server/petstore/python-aiohttp-srclayout/.openapi-generator/VERSION +++ b/samples/server/petstore/python-aiohttp-srclayout/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/python-aiohttp/.openapi-generator/VERSION b/samples/server/petstore/python-aiohttp/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/server/petstore/python-aiohttp/.openapi-generator/VERSION +++ b/samples/server/petstore/python-aiohttp/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/python-blueplanet/.openapi-generator/VERSION b/samples/server/petstore/python-blueplanet/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/server/petstore/python-blueplanet/.openapi-generator/VERSION +++ b/samples/server/petstore/python-blueplanet/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/python-fastapi/.openapi-generator/VERSION b/samples/server/petstore/python-fastapi/.openapi-generator/VERSION index 4b448de535c..5f68295fc19 100644 --- a/samples/server/petstore/python-fastapi/.openapi-generator/VERSION +++ b/samples/server/petstore/python-fastapi/.openapi-generator/VERSION @@ -1 +1 @@ -5.3.0-SNAPSHOT \ No newline at end of file +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/python-flask/.openapi-generator/VERSION b/samples/server/petstore/python-flask/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/server/petstore/python-flask/.openapi-generator/VERSION +++ b/samples/server/petstore/python-flask/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/rust-server/output/multipart-v3/.openapi-generator/VERSION b/samples/server/petstore/rust-server/output/multipart-v3/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/server/petstore/rust-server/output/multipart-v3/.openapi-generator/VERSION +++ b/samples/server/petstore/rust-server/output/multipart-v3/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/rust-server/output/no-example-v3/.openapi-generator/VERSION b/samples/server/petstore/rust-server/output/no-example-v3/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/server/petstore/rust-server/output/no-example-v3/.openapi-generator/VERSION +++ b/samples/server/petstore/rust-server/output/no-example-v3/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/rust-server/output/openapi-v3/.openapi-generator/VERSION b/samples/server/petstore/rust-server/output/openapi-v3/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/server/petstore/rust-server/output/openapi-v3/.openapi-generator/VERSION +++ b/samples/server/petstore/rust-server/output/openapi-v3/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/rust-server/output/ops-v3/.openapi-generator/VERSION b/samples/server/petstore/rust-server/output/ops-v3/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/server/petstore/rust-server/output/ops-v3/.openapi-generator/VERSION +++ b/samples/server/petstore/rust-server/output/ops-v3/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/.openapi-generator/VERSION b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/.openapi-generator/VERSION +++ b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/rust-server/output/ping-bearer-auth/.openapi-generator/VERSION b/samples/server/petstore/rust-server/output/ping-bearer-auth/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/server/petstore/rust-server/output/ping-bearer-auth/.openapi-generator/VERSION +++ b/samples/server/petstore/rust-server/output/ping-bearer-auth/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/rust-server/output/rust-server-test/.openapi-generator/VERSION b/samples/server/petstore/rust-server/output/rust-server-test/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/server/petstore/rust-server/output/rust-server-test/.openapi-generator/VERSION +++ b/samples/server/petstore/rust-server/output/rust-server-test/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/spring-mvc-default-value/.openapi-generator/VERSION b/samples/server/petstore/spring-mvc-default-value/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/server/petstore/spring-mvc-default-value/.openapi-generator/VERSION +++ b/samples/server/petstore/spring-mvc-default-value/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/spring-mvc-default-value/src/main/java/org/openapitools/api/TestHeadersApi.java b/samples/server/petstore/spring-mvc-default-value/src/main/java/org/openapitools/api/TestHeadersApi.java index e81001ded17..85e2db8065b 100644 --- a/samples/server/petstore/spring-mvc-default-value/src/main/java/org/openapitools/api/TestHeadersApi.java +++ b/samples/server/petstore/spring-mvc-default-value/src/main/java/org/openapitools/api/TestHeadersApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/spring-mvc-default-value/src/main/java/org/openapitools/api/TestQueryParamsApi.java b/samples/server/petstore/spring-mvc-default-value/src/main/java/org/openapitools/api/TestQueryParamsApi.java index 5a11043a6ae..8bb61fd16e1 100644 --- a/samples/server/petstore/spring-mvc-default-value/src/main/java/org/openapitools/api/TestQueryParamsApi.java +++ b/samples/server/petstore/spring-mvc-default-value/src/main/java/org/openapitools/api/TestQueryParamsApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/spring-mvc-j8-async/.openapi-generator/VERSION b/samples/server/petstore/spring-mvc-j8-async/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/server/petstore/spring-mvc-j8-async/.openapi-generator/VERSION +++ b/samples/server/petstore/spring-mvc-j8-async/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/AnotherFakeApi.java index 96322995115..aec668984f0 100644 --- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/FakeApi.java index 69fd1de78b5..a22c4668657 100644 --- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/FakeApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index a7d623dfc06..1f859ad0744 100644 --- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/PetApi.java index 87c2bf62e1a..dab68aed8b1 100644 --- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/PetApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/StoreApi.java index d68594abde2..126b9e38c23 100644 --- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/StoreApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/UserApi.java index bedad994840..b54f4d06195 100644 --- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/api/UserApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/.openapi-generator/VERSION b/samples/server/petstore/spring-mvc-j8-localdatetime/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/server/petstore/spring-mvc-j8-localdatetime/.openapi-generator/VERSION +++ b/samples/server/petstore/spring-mvc-j8-localdatetime/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/AnotherFakeApi.java index 3ee84f0dcc3..67df1501f09 100644 --- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/FakeApi.java index b37b2a56ce8..efc20852e16 100644 --- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/FakeApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index f4bbfdc593a..7adfddb01e7 100644 --- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/PetApi.java index 90b15210bc8..f4f5c97755f 100644 --- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/PetApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/StoreApi.java index c3534db4fe8..a12dc1250c2 100644 --- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/StoreApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/UserApi.java index c231313c77f..da836caf4bf 100644 --- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/api/UserApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/spring-mvc-no-nullable/.openapi-generator/VERSION b/samples/server/petstore/spring-mvc-no-nullable/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/server/petstore/spring-mvc-no-nullable/.openapi-generator/VERSION +++ b/samples/server/petstore/spring-mvc-no-nullable/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/api/AnotherFakeApi.java index 3ee84f0dcc3..67df1501f09 100644 --- a/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/api/FakeApi.java index fa4d1f4009b..4227fb26a50 100644 --- a/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/api/FakeApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index f4bbfdc593a..7adfddb01e7 100644 --- a/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/api/PetApi.java index 90b15210bc8..f4f5c97755f 100644 --- a/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/api/PetApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/api/StoreApi.java index c3534db4fe8..a12dc1250c2 100644 --- a/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/api/StoreApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/api/UserApi.java index c231313c77f..da836caf4bf 100644 --- a/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/spring-mvc-no-nullable/src/main/java/org/openapitools/api/UserApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/spring-mvc-spring-pageable/.openapi-generator/VERSION b/samples/server/petstore/spring-mvc-spring-pageable/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/server/petstore/spring-mvc-spring-pageable/.openapi-generator/VERSION +++ b/samples/server/petstore/spring-mvc-spring-pageable/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/api/AnotherFakeApi.java index 3ee84f0dcc3..67df1501f09 100644 --- a/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/api/FakeApi.java index 25b8b894ed0..cdf16fc14a7 100644 --- a/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/api/FakeApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index f4bbfdc593a..7adfddb01e7 100644 --- a/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/api/PetApi.java index 99609959e7a..c4f0ea452d1 100644 --- a/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/api/PetApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java index c3534db4fe8..a12dc1250c2 100644 --- a/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/api/UserApi.java index c231313c77f..da836caf4bf 100644 --- a/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/spring-mvc-spring-pageable/src/main/java/org/openapitools/api/UserApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/spring-mvc/.openapi-generator/VERSION b/samples/server/petstore/spring-mvc/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/server/petstore/spring-mvc/.openapi-generator/VERSION +++ b/samples/server/petstore/spring-mvc/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/AnotherFakeApi.java index 3ee84f0dcc3..67df1501f09 100644 --- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/FakeApi.java index fa4d1f4009b..4227fb26a50 100644 --- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/FakeApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index f4bbfdc593a..7adfddb01e7 100644 --- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/PetApi.java index 90b15210bc8..f4f5c97755f 100644 --- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/PetApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/StoreApi.java index c3534db4fe8..a12dc1250c2 100644 --- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/StoreApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/UserApi.java index c231313c77f..da836caf4bf 100644 --- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/api/UserApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/.openapi-generator/VERSION b/samples/server/petstore/springboot-beanvalidation-no-nullable/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/.openapi-generator/VERSION +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/AnotherFakeApi.java index 6c2e7b60bdd..9e8eda9066f 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApi.java index b9ec57fc660..d9119ee3ba4 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index 780881750bc..980ac9450f3 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/PetApi.java index e4df95143d9..c4dcefbba25 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/PetApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/StoreApi.java index a550834adb8..afad5769803 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/StoreApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/UserApi.java index 74963cebcf6..20446a44497 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/UserApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-beanvalidation/.openapi-generator/VERSION b/samples/server/petstore/springboot-beanvalidation/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/server/petstore/springboot-beanvalidation/.openapi-generator/VERSION +++ b/samples/server/petstore/springboot-beanvalidation/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/AnotherFakeApi.java index 3ee84f0dcc3..67df1501f09 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApi.java index fa4d1f4009b..4227fb26a50 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index f4bbfdc593a..7adfddb01e7 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/PetApi.java index 90b15210bc8..f4f5c97755f 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/PetApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApi.java index c3534db4fe8..a12dc1250c2 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/UserApi.java index c231313c77f..da836caf4bf 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/UserApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-delegate-j8/.openapi-generator/VERSION b/samples/server/petstore/springboot-delegate-j8/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/server/petstore/springboot-delegate-j8/.openapi-generator/VERSION +++ b/samples/server/petstore/springboot-delegate-j8/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java index 6d74f1f2928..c95e8d5ae7a 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApi.java index f5fe4e2947d..19a5ac37fbf 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index 6fc8b7f87ba..30fb4866522 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/PetApi.java index 33df790a66a..74eea454d7f 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/PetApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApi.java index 71184e1fbab..cf465fac207 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/UserApi.java index 3b02594b37f..27833c4ef16 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/UserApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-delegate/.openapi-generator/VERSION b/samples/server/petstore/springboot-delegate/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/server/petstore/springboot-delegate/.openapi-generator/VERSION +++ b/samples/server/petstore/springboot-delegate/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApi.java index 6d74f1f2928..c95e8d5ae7a 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java index f5fe4e2947d..19a5ac37fbf 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index 6fc8b7f87ba..30fb4866522 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApi.java index 33df790a66a..74eea454d7f 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java index 71184e1fbab..cf465fac207 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApi.java index 3b02594b37f..27833c4ef16 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-implicitHeaders/.openapi-generator/VERSION b/samples/server/petstore/springboot-implicitHeaders/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/server/petstore/springboot-implicitHeaders/.openapi-generator/VERSION +++ b/samples/server/petstore/springboot-implicitHeaders/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApi.java index a2c54553dd4..75bdb0b8539 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java index f014549bf12..1cebeb454b4 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index c7faab93552..d92c57b392a 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApi.java index c9d16545968..68efcd6434f 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java index 5f0e4db290a..f3a868e4b3d 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApi.java index 2194adce4c5..d9fda863c7d 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-reactive/.openapi-generator/VERSION b/samples/server/petstore/springboot-reactive/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/server/petstore/springboot-reactive/.openapi-generator/VERSION +++ b/samples/server/petstore/springboot-reactive/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApi.java index c7526b2b31d..bdf4300d636 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApi.java index 856dbdfce15..c34d973f330 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index 8e60df9d824..5307e824fff 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApi.java index 9f0bff4f857..ce0a1a31881 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApi.java index 92716796c80..62f6b2da0f5 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApi.java index b1fd2d37dd3..35b75fe3e68 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/.openapi-generator/VERSION b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/.openapi-generator/VERSION +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java index 6c2e7b60bdd..9e8eda9066f 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeApi.java index 8f6590220dc..70a9f1aebc2 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index 780881750bc..980ac9450f3 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/PetApi.java index 6260b18265a..4822e83b42a 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/PetApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/StoreApi.java index a550834adb8..afad5769803 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/StoreApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/UserApi.java index 74963cebcf6..20446a44497 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/UserApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/.openapi-generator/VERSION b/samples/server/petstore/springboot-spring-pageable-delegatePattern/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/.openapi-generator/VERSION +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/AnotherFakeApi.java index 6d74f1f2928..c95e8d5ae7a 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeApi.java index a9bf8cdbe14..34dcbf602e4 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index 6fc8b7f87ba..30fb4866522 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/PetApi.java index efd513205e3..26a89838161 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/PetApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/StoreApi.java index 71184e1fbab..cf465fac207 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/StoreApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/UserApi.java index 3b02594b37f..27833c4ef16 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/UserApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/.openapi-generator/VERSION b/samples/server/petstore/springboot-spring-pageable-without-j8/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/.openapi-generator/VERSION +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java index 6c2e7b60bdd..9e8eda9066f 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeApi.java index 8f6590220dc..70a9f1aebc2 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index 780881750bc..980ac9450f3 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/PetApi.java index 6260b18265a..4822e83b42a 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/PetApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/StoreApi.java index a550834adb8..afad5769803 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/StoreApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/UserApi.java index 74963cebcf6..20446a44497 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/UserApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable/.openapi-generator/VERSION b/samples/server/petstore/springboot-spring-pageable/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/server/petstore/springboot-spring-pageable/.openapi-generator/VERSION +++ b/samples/server/petstore/springboot-spring-pageable/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/AnotherFakeApi.java index 3ee84f0dcc3..67df1501f09 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeApi.java index 25b8b894ed0..cdf16fc14a7 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index f4bbfdc593a..7adfddb01e7 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/PetApi.java index 99609959e7a..c4f0ea452d1 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/PetApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java index c3534db4fe8..a12dc1250c2 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/UserApi.java index c231313c77f..da836caf4bf 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/UserApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-useoptional/.openapi-generator/VERSION b/samples/server/petstore/springboot-useoptional/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/server/petstore/springboot-useoptional/.openapi-generator/VERSION +++ b/samples/server/petstore/springboot-useoptional/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/AnotherFakeApi.java index 3ee84f0dcc3..67df1501f09 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApi.java index e4e555de534..1d0a086cada 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index f4bbfdc593a..7adfddb01e7 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/PetApi.java index 8e22d83cb32..e1569c5d992 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/PetApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApi.java index c3534db4fe8..a12dc1250c2 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/UserApi.java index c231313c77f..da836caf4bf 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/UserApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-virtualan/.openapi-generator/VERSION b/samples/server/petstore/springboot-virtualan/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/server/petstore/springboot-virtualan/.openapi-generator/VERSION +++ b/samples/server/petstore/springboot-virtualan/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/AnotherFakeApi.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/AnotherFakeApi.java index 800ca008b56..a214e7eb369 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/AnotherFakeApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeApi.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeApi.java index e1fae24730a..dcbf03c7152 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeApi.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeClassnameTestApi.java index 60875426010..a844ea2c160 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeClassnameTestApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/PetApi.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/PetApi.java index 43e4dd5a398..14564c051ff 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/PetApi.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/PetApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/StoreApi.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/StoreApi.java index 008abad61ac..884a34a4f85 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/StoreApi.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/StoreApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/UserApi.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/UserApi.java index 9e4d04d36be..57c7e4624ce 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/UserApi.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/UserApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot/.openapi-generator/VERSION b/samples/server/petstore/springboot/.openapi-generator/VERSION index e8415097f3a..5f68295fc19 100644 --- a/samples/server/petstore/springboot/.openapi-generator/VERSION +++ b/samples/server/petstore/springboot/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -6.0.0-SNAPSHOT -======= -5.3.0-SNAPSHOT ->>>>>>> origin/5.3.x +6.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/AnotherFakeApi.java index 3ee84f0dcc3..67df1501f09 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/AnotherFakeApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeApi.java index fa4d1f4009b..4227fb26a50 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeClassnameTestApi.java index f4bbfdc593a..7adfddb01e7 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeClassnameTestApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/PetApi.java index 90b15210bc8..f4f5c97755f 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/PetApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java index c3534db4fe8..a12dc1250c2 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */ diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/UserApi.java index c231313c77f..da836caf4bf 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/UserApi.java @@ -1,9 +1,5 @@ /** -<<<<<<< HEAD * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT). -======= - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT). ->>>>>>> origin/5.3.x * https://openapi-generator.tech * Do not edit the class manually. */