update samples without batch mode

samples/client/petstore/dart2/petstore_client_lib/.openapi-generator/VERSION

@@ -1,9 +1 @@
-<<<<<<< HEAD
 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-4.3.0-SNAPSHOT
-=======
-4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x

samples/client/petstore/dart2/petstore_client_lib/lib/api_client.dart

@@ -137,6 +137,8 @@ class ApiClient {
           return client.delete(url, headers: headerParams);
         case "PATCH":
           return client.patch(url, headers: headerParams, body: msgBody);
+        case "HEAD":
+          return client.head(url, headers: headerParams);
         default:
           return client.get(url, headers: headerParams);
       }

samples/client/petstore/go-experimental/go-petstore/.openapi-generator/VERSION

@@ -1,9 +1 @@
-<<<<<<< HEAD
 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-4.3.0-SNAPSHOT
-=======
-4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x

samples/client/petstore/go-experimental/go-petstore/client.go

@@ -350,6 +350,9 @@ func (c *APIClient) prepareRequest(
 }
 
 func (c *APIClient) decode(v interface{}, b []byte, contentType string) (err error) {
+	if len(b) == 0 {
+		return nil
+	}
 	if s, ok := v.(*string); ok {
 		*s = string(b)
 		return nil

samples/client/petstore/kotlin-gson/.openapi-generator/VERSION

@@ -1 +1 @@
-4.2.2-SNAPSHOT
+5.0.0-SNAPSHOT

samples/client/petstore/kotlin-nonpublic/.openapi-generator/VERSION

@@ -1 +1 @@
-4.2.2-SNAPSHOT
+5.0.0-SNAPSHOT

samples/client/petstore/kotlin-nullable/.openapi-generator/VERSION

@@ -1 +1 @@
-4.2.2-SNAPSHOT
+5.0.0-SNAPSHOT

samples/client/petstore/kotlin-okhttp3/.openapi-generator/VERSION

@@ -1 +1 @@
-4.2.2-SNAPSHOT
+5.0.0-SNAPSHOT

samples/client/petstore/nim/.openapi-generator/VERSION

@@ -1,9 +1 @@
-<<<<<<< HEAD
 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-4.3.0-SNAPSHOT
-=======
-4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x

samples/client/petstore/php/OpenAPIClient-php/test/Api/AnotherFakeApiTest.php

@@ -17,11 +17,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
  */
 
 /**

samples/client/petstore/php/OpenAPIClient-php/test/Api/FakeApiTest.php

@@ -17,11 +17,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
  */
 
 /**

samples/client/petstore/php/OpenAPIClient-php/test/Api/FakeClassnameTags123ApiTest.php

@@ -17,11 +17,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
  */
 
 /**

samples/client/petstore/php/OpenAPIClient-php/test/Api/PetApiTest.php

@@ -17,11 +17,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
  */
 
 /**

samples/client/petstore/php/OpenAPIClient-php/test/Api/StoreApiTest.php

@@ -17,11 +17,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
  */
 
 /**

samples/client/petstore/php/OpenAPIClient-php/test/Api/UserApiTest.php

@@ -17,11 +17,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
  */
 
 /**

samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesAnyTypeTest.php

@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
  */
 
 /**

samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesArrayTest.php

@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
  */
 
 /**

samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesBooleanTest.php

@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
  */
 
 /**

samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesClassTest.php

@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
  */
 
 /**

samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesIntegerTest.php

@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
  */
 
 /**

samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesNumberTest.php

@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
  */
 
 /**

samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesObjectTest.php

@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
  */
 
 /**

samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesStringTest.php

@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
  */
 
 /**

samples/client/petstore/php/OpenAPIClient-php/test/Model/AnimalTest.php

@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
  */
 
 /**

samples/client/petstore/php/OpenAPIClient-php/test/Model/ApiResponseTest.php

@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
  */
 
 /**

samples/client/petstore/php/OpenAPIClient-php/test/Model/ArrayOfArrayOfNumberOnlyTest.php

@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
  */
 
 /**

samples/client/petstore/php/OpenAPIClient-php/test/Model/ArrayOfNumberOnlyTest.php

@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
  */
 
 /**

samples/client/petstore/php/OpenAPIClient-php/test/Model/ArrayTestTest.php

@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
  */
 
 /**

samples/client/petstore/php/OpenAPIClient-php/test/Model/CapitalizationTest.php

@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
  */
 
 /**

samples/client/petstore/php/OpenAPIClient-php/test/Model/CatAllOfTest.php

@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
  */
 
 /**

samples/client/petstore/php/OpenAPIClient-php/test/Model/CatTest.php

@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
  */
 
 /**

samples/client/petstore/php/OpenAPIClient-php/test/Model/CategoryTest.php

@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
  */
 
 /**

samples/client/petstore/php/OpenAPIClient-php/test/Model/ClassModelTest.php

@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
  */
 
 /**

samples/client/petstore/php/OpenAPIClient-php/test/Model/ClientTest.php

@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
  */
 
 /**

samples/client/petstore/php/OpenAPIClient-php/test/Model/DogAllOfTest.php

@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
  */
 
 /**

samples/client/petstore/php/OpenAPIClient-php/test/Model/DogTest.php

@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
  */
 
 /**

samples/client/petstore/php/OpenAPIClient-php/test/Model/EnumArraysTest.php

@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
  */
 
 /**

samples/client/petstore/php/OpenAPIClient-php/test/Model/EnumClassTest.php

@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
  */
 
 /**

samples/client/petstore/php/OpenAPIClient-php/test/Model/EnumTestTest.php

@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
  */
 
 /**

samples/client/petstore/php/OpenAPIClient-php/test/Model/FileSchemaTestClassTest.php

@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
  */
 
 /**

samples/client/petstore/php/OpenAPIClient-php/test/Model/FileTest.php

@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
  */
 
 /**

samples/client/petstore/php/OpenAPIClient-php/test/Model/FormatTestTest.php

@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
  */
 
 /**

samples/client/petstore/php/OpenAPIClient-php/test/Model/HasOnlyReadOnlyTest.php

@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
  */
 
 /**

samples/client/petstore/php/OpenAPIClient-php/test/Model/MapTestTest.php

@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
  */
 
 /**

samples/client/petstore/php/OpenAPIClient-php/test/Model/MixedPropertiesAndAdditionalPropertiesClassTest.php

@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
  */
 
 /**

samples/client/petstore/php/OpenAPIClient-php/test/Model/Model200ResponseTest.php

@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
  */
 
 /**

samples/client/petstore/php/OpenAPIClient-php/test/Model/ModelListTest.php

@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
  */
 
 /**

samples/client/petstore/php/OpenAPIClient-php/test/Model/ModelReturnTest.php

@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
  */
 
 /**

samples/client/petstore/php/OpenAPIClient-php/test/Model/NameTest.php

@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
  */
 
 /**

samples/client/petstore/php/OpenAPIClient-php/test/Model/NumberOnlyTest.php

@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
  */
 
 /**

samples/client/petstore/php/OpenAPIClient-php/test/Model/OrderTest.php

@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
  */
 
 /**

samples/client/petstore/php/OpenAPIClient-php/test/Model/OuterCompositeTest.php

@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
  */
 
 /**

samples/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumTest.php

@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
  */
 
 /**

samples/client/petstore/php/OpenAPIClient-php/test/Model/PetTest.php

@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
  */
 
 /**

samples/client/petstore/php/OpenAPIClient-php/test/Model/ReadOnlyFirstTest.php

@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
  */
 
 /**

samples/client/petstore/php/OpenAPIClient-php/test/Model/SpecialModelNameTest.php

@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
  */
 
 /**

samples/client/petstore/php/OpenAPIClient-php/test/Model/TagTest.php

@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
  */
 
 /**

samples/client/petstore/php/OpenAPIClient-php/test/Model/TypeHolderDefaultTest.php

@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
  */
 
 /**

samples/client/petstore/php/OpenAPIClient-php/test/Model/TypeHolderExampleTest.php

@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
  */
 
 /**

samples/client/petstore/php/OpenAPIClient-php/test/Model/UserTest.php

@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
  */
 
 /**

samples/client/petstore/php/OpenAPIClient-php/test/Model/XmlItemTest.php

@@ -18,11 +18,7 @@
  * The version of the OpenAPI document: 1.0.0
  * 
  * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
  * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
  */
 
 /**

samples/client/petstore/ruby/spec/api/another_fake_api_spec.rb

@@ -6,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =end
 

samples/client/petstore/ruby/spec/api/fake_api_spec.rb

@@ -6,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =end
 

samples/client/petstore/ruby/spec/api/fake_classname_tags123_api_spec.rb

@@ -6,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =end
 

samples/client/petstore/ruby/spec/api/pet_api_spec.rb

@@ -6,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =end
 

samples/client/petstore/ruby/spec/api/store_api_spec.rb

@@ -6,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =end
 

samples/client/petstore/ruby/spec/api/user_api_spec.rb

@@ -6,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =end
 

samples/client/petstore/ruby/spec/api_client_spec.rb

@@ -6,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =end
 

samples/client/petstore/ruby/spec/configuration_spec.rb

@@ -6,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =end
 

samples/client/petstore/ruby/spec/models/additional_properties_any_type_spec.rb

@@ -6,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =end
 

samples/client/petstore/ruby/spec/models/additional_properties_array_spec.rb

@@ -6,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =end
 

samples/client/petstore/ruby/spec/models/additional_properties_boolean_spec.rb

@@ -6,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =end
 

samples/client/petstore/ruby/spec/models/additional_properties_class_spec.rb

@@ -6,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =end
 

samples/client/petstore/ruby/spec/models/additional_properties_integer_spec.rb

@@ -6,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =end
 

samples/client/petstore/ruby/spec/models/additional_properties_number_spec.rb

@@ -6,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =end
 

samples/client/petstore/ruby/spec/models/additional_properties_object_spec.rb

@@ -6,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =end
 

samples/client/petstore/ruby/spec/models/additional_properties_string_spec.rb

@@ -6,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =end
 

samples/client/petstore/ruby/spec/models/animal_spec.rb

@@ -6,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =end
 

samples/client/petstore/ruby/spec/models/api_response_spec.rb

@@ -6,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =end
 

samples/client/petstore/ruby/spec/models/array_of_array_of_number_only_spec.rb

@@ -6,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =end
 

samples/client/petstore/ruby/spec/models/array_of_number_only_spec.rb

@@ -6,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =end
 

samples/client/petstore/ruby/spec/models/array_test_spec.rb

@@ -6,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =end
 

samples/client/petstore/ruby/spec/models/capitalization_spec.rb

@@ -6,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =end
 

samples/client/petstore/ruby/spec/models/cat_all_of_spec.rb

@@ -6,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =end
 

samples/client/petstore/ruby/spec/models/cat_spec.rb

@@ -6,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =end
 

samples/client/petstore/ruby/spec/models/category_spec.rb

@@ -6,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =end
 

samples/client/petstore/ruby/spec/models/class_model_spec.rb

@@ -6,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =end
 

samples/client/petstore/ruby/spec/models/client_spec.rb

@@ -6,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =end
 

samples/client/petstore/ruby/spec/models/dog_all_of_spec.rb

@@ -6,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =end
 

samples/client/petstore/ruby/spec/models/dog_spec.rb

@@ -6,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =end
 

samples/client/petstore/ruby/spec/models/enum_arrays_spec.rb

@@ -6,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =end
 

samples/client/petstore/ruby/spec/models/enum_class_spec.rb

@@ -6,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =end
 

samples/client/petstore/ruby/spec/models/enum_test_spec.rb

@@ -6,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =end
 

samples/client/petstore/ruby/spec/models/file_schema_test_class_spec.rb

@@ -6,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =end
 

samples/client/petstore/ruby/spec/models/file_spec.rb

@@ -6,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =end
 

samples/client/petstore/ruby/spec/models/format_test_spec.rb

@@ -6,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =end
 

samples/client/petstore/ruby/spec/models/has_only_read_only_spec.rb

@@ -6,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =end
 

samples/client/petstore/ruby/spec/models/list_spec.rb

@@ -6,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =end
 

samples/client/petstore/ruby/spec/models/map_test_spec.rb

@@ -6,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =end
 

samples/client/petstore/ruby/spec/models/mixed_properties_and_additional_properties_class_spec.rb

@@ -6,15 +6,7 @@
 The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
-<<<<<<< HEAD
-OpenAPI Generator version: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
->>>>>>> 4.3.x
 
 =end