update samples

2025-12-11 16:12:49 +00:00 · 2020-04-21 02:22:55 +08:00
parent 935f6100c3
commit 5a9b0fcf9e
1089 changed files with 794 additions and 4499 deletions
--- a/samples/client/petstore/ruby/.openapi-generator/VERSION
+++ b/samples/client/petstore/ruby/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.0.0-SNAPSHOT
-=======
-4.3.1-SNAPSHOT
->>>>>>> origin/master
+5.0.0-SNAPSHOT
--- 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: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master

 =end

--- 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: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master

 =end

--- 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: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master

 =end

--- 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: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master

 =end

--- 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: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master

 =end

--- 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: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master

 =end

--- 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: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master

 =end

--- 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: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master

 =end

--- 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: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master

 =end

--- 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: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master

 =end

--- a/samples/client/petstore/ruby/lib/petstore/models/additional_properties_any_type.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/additional_properties_any_type.rb
@@ -6,11 +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
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master

 =end

--- a/samples/client/petstore/ruby/lib/petstore/models/additional_properties_array.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/additional_properties_array.rb
@@ -6,11 +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
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master

 =end

--- a/samples/client/petstore/ruby/lib/petstore/models/additional_properties_boolean.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/additional_properties_boolean.rb
@@ -6,11 +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
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master

 =end

--- 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: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master

 =end

--- a/samples/client/petstore/ruby/lib/petstore/models/additional_properties_integer.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/additional_properties_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: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master

 =end

--- a/samples/client/petstore/ruby/lib/petstore/models/additional_properties_number.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/additional_properties_number.rb
@@ -6,11 +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
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master

 =end

--- a/samples/client/petstore/ruby/lib/petstore/models/additional_properties_object.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/additional_properties_object.rb
@@ -6,11 +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
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master

 =end

--- a/samples/client/petstore/ruby/lib/petstore/models/additional_properties_string.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/additional_properties_string.rb
@@ -6,11 +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
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master

 =end

--- 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: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master

 =end

--- 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: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master

 =end

--- 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: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master

 =end

--- 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: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master

 =end

--- 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: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master

 =end

--- a/samples/client/petstore/ruby/lib/petstore/models/big_cat.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/big_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: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master

 =end

--- a/samples/client/petstore/ruby/lib/petstore/models/big_cat_all_of.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/big_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: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master

 =end

--- 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: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master

 =end

--- 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: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master

 =end

--- 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: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master

 =end

--- 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: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master

 =end

--- 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: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master

 =end

--- 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: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master

 =end

--- 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: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master

 =end

--- 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: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master

 =end

--- 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: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master

 =end

--- 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: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master

 =end

--- 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: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master

 =end

--- 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: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master

 =end

--- 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: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master

 =end

--- 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: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master

 =end

--- 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: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master

 =end

--- 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: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master

 =end

--- 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: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master

 =end

--- 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: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master

 =end

--- 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: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master

 =end

--- 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: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master

 =end

--- 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: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master

 =end

--- 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: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master

 =end

--- 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: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master

 =end

--- 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: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master

 =end

--- 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: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master

 =end

--- 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: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master

 =end

--- 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: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master

 =end

--- 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: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master

 =end

--- 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: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master

 =end

--- a/samples/client/petstore/ruby/lib/petstore/models/type_holder_default.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/type_holder_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: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master

 =end

--- a/samples/client/petstore/ruby/lib/petstore/models/type_holder_example.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/type_holder_example.rb
@@ -6,11 +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
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master

 =end

--- 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: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master

 =end

--- a/samples/client/petstore/ruby/lib/petstore/models/xml_item.rb
+++ b/samples/client/petstore/ruby/lib/petstore/models/xml_item.rb
@@ -6,11 +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
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master

 =end

--- 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: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master

 =end

--- 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: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master

 =end

--- a/samples/client/petstore/ruby/spec/api/another_fake_api_spec.rb
+++ b/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: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master

 =end

--- a/samples/client/petstore/ruby/spec/api/fake_api_spec.rb
+++ b/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: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master

 =end

--- a/samples/client/petstore/ruby/spec/api/fake_classname_tags123_api_spec.rb
+++ b/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: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master

 =end

--- a/samples/client/petstore/ruby/spec/api/pet_api_spec.rb
+++ b/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: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master

 =end

--- a/samples/client/petstore/ruby/spec/api/store_api_spec.rb
+++ b/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: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master

 =end

--- a/samples/client/petstore/ruby/spec/api/user_api_spec.rb
+++ b/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: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master

 =end

--- 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: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master

 =end

--- 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: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master

 =end

--- a/samples/client/petstore/ruby/spec/models/additional_properties_any_type_spec.rb
+++ b/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: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master

 =end

--- a/samples/client/petstore/ruby/spec/models/additional_properties_array_spec.rb
+++ b/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: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master

 =end

--- a/samples/client/petstore/ruby/spec/models/additional_properties_boolean_spec.rb
+++ b/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: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master

 =end

--- a/samples/client/petstore/ruby/spec/models/additional_properties_class_spec.rb
+++ b/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: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master

 =end

--- a/samples/client/petstore/ruby/spec/models/additional_properties_integer_spec.rb
+++ b/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: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master

 =end

--- a/samples/client/petstore/ruby/spec/models/additional_properties_number_spec.rb
+++ b/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: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master

 =end

--- a/samples/client/petstore/ruby/spec/models/additional_properties_object_spec.rb
+++ b/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: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master

 =end

--- a/samples/client/petstore/ruby/spec/models/additional_properties_string_spec.rb
+++ b/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: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master

 =end

--- a/samples/client/petstore/ruby/spec/models/animal_spec.rb
+++ b/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: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master

 =end

--- a/samples/client/petstore/ruby/spec/models/api_response_spec.rb
+++ b/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: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master

 =end

--- a/samples/client/petstore/ruby/spec/models/array_of_array_of_number_only_spec.rb
+++ b/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: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master

 =end

--- a/samples/client/petstore/ruby/spec/models/array_of_number_only_spec.rb
+++ b/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: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master

 =end

--- a/samples/client/petstore/ruby/spec/models/array_test_spec.rb
+++ b/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: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master

 =end

--- a/samples/client/petstore/ruby/spec/models/big_cat_all_of_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/big_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: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master

 =end

--- a/samples/client/petstore/ruby/spec/models/big_cat_spec.rb
+++ b/samples/client/petstore/ruby/spec/models/big_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: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master

 =end

--- a/samples/client/petstore/ruby/spec/models/capitalization_spec.rb
+++ b/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: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master

 =end

--- a/samples/client/petstore/ruby/spec/models/cat_all_of_spec.rb
+++ b/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: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master

 =end

--- a/samples/client/petstore/ruby/spec/models/cat_spec.rb
+++ b/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: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master

 =end

--- a/samples/client/petstore/ruby/spec/models/category_spec.rb
+++ b/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: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master

 =end

--- a/samples/client/petstore/ruby/spec/models/class_model_spec.rb
+++ b/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: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master

 =end

--- a/samples/client/petstore/ruby/spec/models/client_spec.rb
+++ b/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: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master

 =end

--- a/samples/client/petstore/ruby/spec/models/dog_all_of_spec.rb
+++ b/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: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master

 =end

--- a/samples/client/petstore/ruby/spec/models/dog_spec.rb
+++ b/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: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master

 =end

--- a/samples/client/petstore/ruby/spec/models/enum_arrays_spec.rb
+++ b/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: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master

 =end

--- a/samples/client/petstore/ruby/spec/models/enum_class_spec.rb
+++ b/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: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master

 =end

--- a/samples/client/petstore/ruby/spec/models/enum_test_spec.rb
+++ b/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: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master

 =end

--- a/samples/client/petstore/ruby/spec/models/file_schema_test_class_spec.rb
+++ b/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: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master

 =end

--- a/samples/client/petstore/ruby/spec/models/file_spec.rb
+++ b/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: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master

 =end

--- a/samples/client/petstore/ruby/spec/models/format_test_spec.rb
+++ b/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: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master

 =end

--- a/samples/client/petstore/ruby/spec/models/has_only_read_only_spec.rb
+++ b/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: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master

 =end

--- a/samples/client/petstore/ruby/spec/models/list_spec.rb
+++ b/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: 5.0.0-SNAPSHOT
-=======
-OpenAPI Generator version: 4.3.1-SNAPSHOT
->>>>>>> origin/master

 =end

--- a/Show More
+++ b/Show More