update samples

docs/generators/kotlin.md

@@ -17,4 +17,4 @@ sidebar_label: kotlin
 |serializableModel|boolean - toggle "implements Serializable" for generated models| |null|
 |dateLibrary|Option. Date library to use|<dl><dt>**string**</dt><dd>String</dd><dt>**java8**</dt><dd>Java 8 native JSR310 (jvm only)</dd><dt>**threetenbp**</dt><dd>Threetenbp (jvm only)</dd><dl>|java8|
 |collectionType|Option. Collection type to use|<dl><dt>**array**</dt><dd>kotlin.Array</dd><dt>**list**</dt><dd>kotlin.collections.List</dd><dl>|array|
-|library|Library template (sub-template) to use|<dl><dt>**jvm-okhttp4**</dt><dd>[DEFAULT] Platform: Java Virtual Machine. HTTP client: OkHttp 4.2.0 (Android 5.0+ and Java 8+). JSON processing: Moshi 1.8.0.</dd><dt>**jvm-okhttp3**</dt><dd>Platform: Java Virtual Machine. HTTP client: OkHttp 3.12.4 (Android 2.3+ and Java 7+). JSON processing: Moshi 1.8.0.</dd><dt>**retrofit2**</dt><dd>Platform: Java Virtual Machine. HTTP client: Retrofit 2.6.2.</dd><dt>**multiplatform**</dt><dd>Platform: Kotlin multiplatform. HTTP client: Ktor 1.2.4. JSON processing: Kotlinx Serialization: 0.12.0.</dd><dl>|jvm-okhttp4|
+|library|Library template (sub-template) to use|<dl><dt>**jvm-okhttp4**</dt><dd>[DEFAULT] Platform: Java Virtual Machine. HTTP client: OkHttp 4.2.0 (Android 5.0+ and Java 8+). JSON processing: Moshi 1.8.0.</dd><dt>**jvm-okhttp3**</dt><dd>Platform: Java Virtual Machine. HTTP client: OkHttp 3.12.4 (Android 2.3+ and Java 7+). JSON processing: Moshi 1.8.0.</dd><dt>**multiplatform**</dt><dd>Platform: Kotlin multiplatform. HTTP client: Ktor 1.2.4. JSON processing: Kotlinx Serialization: 0.12.0.</dd><dl>|jvm-okhttp4|

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

@@ -1,5 +1 @@
-<<<<<<< HEAD
+4.3.0-SNAPSHOT
-4.3.0-SNAPSHOT
-=======
-4.2.2-SNAPSHOT
->>>>>>> origin/master

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

@@ -1,5 +1 @@
-<<<<<<< HEAD
+4.3.0-SNAPSHOT
-4.3.0-SNAPSHOT
-=======
-4.2.2-SNAPSHOT
->>>>>>> origin/master

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

@@ -1 +1 @@
-4.2.2-SNAPSHOT
+4.3.0-SNAPSHOT

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

@@ -1 +1 @@
-4.2.2-SNAPSHOT
+4.3.0-SNAPSHOT

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

@@ -1 +1 @@
-4.2.2-SNAPSHOT
+4.3.0-SNAPSHOT

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

@@ -1 +1 @@
-4.2.2-SNAPSHOT
+4.3.0-SNAPSHOT

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

@@ -1,5 +1 @@
-<<<<<<< HEAD
+4.3.0-SNAPSHOT
-4.3.0-SNAPSHOT
-=======
-4.2.2-SNAPSHOT
->>>>>>> origin/master

samples/client/petstore/ruby/spec/api/another_fake_api_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: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 

samples/client/petstore/ruby/spec/api/fake_api_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: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 

samples/client/petstore/ruby/spec/api/fake_classname_tags123_api_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: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 

samples/client/petstore/ruby/spec/api/pet_api_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: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 

samples/client/petstore/ruby/spec/api/store_api_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: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 

samples/client/petstore/ruby/spec/api/user_api_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: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 

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: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 

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: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 

samples/client/petstore/ruby/spec/models/additional_properties_any_type_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: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 

samples/client/petstore/ruby/spec/models/additional_properties_array_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: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 

samples/client/petstore/ruby/spec/models/additional_properties_boolean_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: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 

samples/client/petstore/ruby/spec/models/additional_properties_class_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: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 

samples/client/petstore/ruby/spec/models/additional_properties_integer_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: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 

samples/client/petstore/ruby/spec/models/additional_properties_number_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: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 

samples/client/petstore/ruby/spec/models/additional_properties_object_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: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 

samples/client/petstore/ruby/spec/models/additional_properties_string_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: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 

samples/client/petstore/ruby/spec/models/animal_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: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 

samples/client/petstore/ruby/spec/models/api_response_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: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 

samples/client/petstore/ruby/spec/models/array_of_array_of_number_only_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: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 

samples/client/petstore/ruby/spec/models/array_of_number_only_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: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 

samples/client/petstore/ruby/spec/models/array_test_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: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 

samples/client/petstore/ruby/spec/models/capitalization_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: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 

samples/client/petstore/ruby/spec/models/cat_all_of_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: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 

samples/client/petstore/ruby/spec/models/cat_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: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 

samples/client/petstore/ruby/spec/models/category_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: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 

samples/client/petstore/ruby/spec/models/class_model_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: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 

samples/client/petstore/ruby/spec/models/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: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 

samples/client/petstore/ruby/spec/models/dog_all_of_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: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 

samples/client/petstore/ruby/spec/models/dog_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: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 

samples/client/petstore/ruby/spec/models/enum_arrays_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: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 

samples/client/petstore/ruby/spec/models/enum_class_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: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 

samples/client/petstore/ruby/spec/models/enum_test_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: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 

samples/client/petstore/ruby/spec/models/file_schema_test_class_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: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 

samples/client/petstore/ruby/spec/models/file_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: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 

samples/client/petstore/ruby/spec/models/format_test_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: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 

samples/client/petstore/ruby/spec/models/has_only_read_only_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: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 

samples/client/petstore/ruby/spec/models/list_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: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 

samples/client/petstore/ruby/spec/models/map_test_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: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 

samples/client/petstore/ruby/spec/models/mixed_properties_and_additional_properties_class_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: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 

samples/client/petstore/ruby/spec/models/model200_response_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: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 

samples/client/petstore/ruby/spec/models/model_return_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: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 

samples/client/petstore/ruby/spec/models/name_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: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 

samples/client/petstore/ruby/spec/models/number_only_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: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 

samples/client/petstore/ruby/spec/models/order_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: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 

samples/client/petstore/ruby/spec/models/outer_composite_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: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 

samples/client/petstore/ruby/spec/models/outer_enum_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: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 

samples/client/petstore/ruby/spec/models/pet_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: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 

samples/client/petstore/ruby/spec/models/read_only_first_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: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 

samples/client/petstore/ruby/spec/models/special_model_name_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: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 

samples/client/petstore/ruby/spec/models/tag_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: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 

samples/client/petstore/ruby/spec/models/type_holder_default_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: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 

samples/client/petstore/ruby/spec/models/type_holder_example_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: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 

samples/client/petstore/ruby/spec/models/user_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: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 

samples/client/petstore/ruby/spec/models/xml_item_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: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 

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: 4.3.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
 
 =end
 

samples/client/petstore/typescript-angular-v8-provided-in-root/builds/single-request-parameter/.openapi-generator/VERSION

@@ -1 +1 @@
-4.2.2-SNAPSHOT
+4.3.0-SNAPSHOT

samples/client/petstore/typescript-angular-v8-provided-in-root/builds/with-prefixed-module-name/.openapi-generator/VERSION

@@ -1,5 +1 @@
-<<<<<<< HEAD
+4.3.0-SNAPSHOT
-4.3.0-SNAPSHOT
-=======
-4.2.2-SNAPSHOT
->>>>>>> origin/master

samples/client/petstore/typescript-fetch/builds/typescript-three-plus/.openapi-generator/VERSION

@@ -1,5 +1 @@
-<<<<<<< HEAD
+4.3.0-SNAPSHOT
-4.3.0-SNAPSHOT
-=======
-4.2.2-SNAPSHOT
->>>>>>> origin/master

samples/client/petstore/typescript-redux-query/builds/with-npm-version/.openapi-generator/VERSION

@@ -1 +1 @@
-4.2.2-SNAPSHOT
+4.3.0-SNAPSHOT

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

@@ -1,5 +1 @@
-<<<<<<< HEAD
+4.3.0-SNAPSHOT
-4.3.0-SNAPSHOT
-=======
-4.2.2-SNAPSHOT
->>>>>>> origin/master

samples/openapi3/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: 4.3.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**

samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Api/DefaultApiTest.php

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

samples/openapi3/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: 4.3.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**

samples/openapi3/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: 4.3.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**

samples/openapi3/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: 4.3.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**

samples/openapi3/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: 4.3.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**

samples/openapi3/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: 4.3.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**

samples/openapi3/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: 4.3.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**

samples/openapi3/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: 4.3.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**

samples/openapi3/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: 4.3.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**

samples/openapi3/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: 4.3.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**

samples/openapi3/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: 4.3.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**

samples/openapi3/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: 4.3.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**

samples/openapi3/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: 4.3.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**

samples/openapi3/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: 4.3.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**

samples/openapi3/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: 4.3.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**

samples/openapi3/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: 4.3.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**

samples/openapi3/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: 4.3.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**

samples/openapi3/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: 4.3.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**

samples/openapi3/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: 4.3.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**

samples/openapi3/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: 4.3.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**

samples/openapi3/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: 4.3.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**

samples/openapi3/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: 4.3.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**

samples/openapi3/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: 4.3.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**

samples/openapi3/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: 4.3.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**

samples/openapi3/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: 4.3.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**

samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/FooTest.php

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

samples/openapi3/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: 4.3.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**

samples/openapi3/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: 4.3.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.2.2-SNAPSHOT
->>>>>>> origin/master
  */
 
 /**

samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/HealthCheckResultTest.php

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

samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/InlineObject1Test.php

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

samples/openapi3/client/petstore/php/OpenAPIClient-php/test/Model/InlineObject2Test.php

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