From e5b6d525c7b99df41f8ea3a7c6de333e7329993e Mon Sep 17 00:00:00 2001 From: William Cheng Date: Thu, 16 Aug 2018 01:34:25 +0800 Subject: [PATCH] update ruby pestore client --- samples/client/petstore/ruby/.openapi-generator/VERSION | 6 +----- samples/client/petstore/ruby/lib/petstore.rb | 4 ---- .../petstore/ruby/lib/petstore/api/another_fake_api.rb | 4 ---- samples/client/petstore/ruby/lib/petstore/api/fake_api.rb | 4 ---- .../ruby/lib/petstore/api/fake_classname_tags123_api.rb | 4 ---- samples/client/petstore/ruby/lib/petstore/api/pet_api.rb | 4 ---- samples/client/petstore/ruby/lib/petstore/api/store_api.rb | 4 ---- samples/client/petstore/ruby/lib/petstore/api/user_api.rb | 4 ---- samples/client/petstore/ruby/lib/petstore/api_client.rb | 4 ---- samples/client/petstore/ruby/lib/petstore/api_error.rb | 4 ---- samples/client/petstore/ruby/lib/petstore/configuration.rb | 4 ---- .../ruby/lib/petstore/models/additional_properties_class.rb | 4 ---- samples/client/petstore/ruby/lib/petstore/models/animal.rb | 4 ---- .../client/petstore/ruby/lib/petstore/models/animal_farm.rb | 4 ---- .../petstore/ruby/lib/petstore/models/api_response.rb | 4 ---- .../lib/petstore/models/array_of_array_of_number_only.rb | 4 ---- .../ruby/lib/petstore/models/array_of_number_only.rb | 4 ---- .../client/petstore/ruby/lib/petstore/models/array_test.rb | 4 ---- .../petstore/ruby/lib/petstore/models/capitalization.rb | 4 ---- samples/client/petstore/ruby/lib/petstore/models/cat.rb | 4 ---- .../client/petstore/ruby/lib/petstore/models/category.rb | 4 ---- .../client/petstore/ruby/lib/petstore/models/class_model.rb | 4 ---- samples/client/petstore/ruby/lib/petstore/models/client.rb | 4 ---- samples/client/petstore/ruby/lib/petstore/models/dog.rb | 4 ---- .../client/petstore/ruby/lib/petstore/models/enum_arrays.rb | 4 ---- .../client/petstore/ruby/lib/petstore/models/enum_class.rb | 4 ---- .../client/petstore/ruby/lib/petstore/models/enum_test.rb | 4 ---- samples/client/petstore/ruby/lib/petstore/models/file.rb | 4 ---- .../ruby/lib/petstore/models/file_schema_test_class.rb | 4 ---- .../client/petstore/ruby/lib/petstore/models/format_test.rb | 4 ---- .../petstore/ruby/lib/petstore/models/has_only_read_only.rb | 4 ---- samples/client/petstore/ruby/lib/petstore/models/list.rb | 4 ---- .../client/petstore/ruby/lib/petstore/models/map_test.rb | 4 ---- .../mixed_properties_and_additional_properties_class.rb | 4 ---- .../petstore/ruby/lib/petstore/models/model200_response.rb | 4 ---- .../petstore/ruby/lib/petstore/models/model_return.rb | 4 ---- samples/client/petstore/ruby/lib/petstore/models/name.rb | 4 ---- .../client/petstore/ruby/lib/petstore/models/number_only.rb | 4 ---- samples/client/petstore/ruby/lib/petstore/models/order.rb | 4 ---- .../petstore/ruby/lib/petstore/models/outer_composite.rb | 4 ---- .../client/petstore/ruby/lib/petstore/models/outer_enum.rb | 4 ---- samples/client/petstore/ruby/lib/petstore/models/pet.rb | 4 ---- .../petstore/ruby/lib/petstore/models/read_only_first.rb | 4 ---- .../petstore/ruby/lib/petstore/models/special_model_name.rb | 4 ---- .../petstore/ruby/lib/petstore/models/string_boolean_map.rb | 4 ---- samples/client/petstore/ruby/lib/petstore/models/tag.rb | 4 ---- samples/client/petstore/ruby/lib/petstore/models/user.rb | 4 ---- samples/client/petstore/ruby/lib/petstore/version.rb | 4 ---- samples/client/petstore/ruby/petstore.gemspec | 4 ---- 49 files changed, 1 insertion(+), 197 deletions(-) diff --git a/samples/client/petstore/ruby/.openapi-generator/VERSION b/samples/client/petstore/ruby/.openapi-generator/VERSION index 148b1f35caf..afa63656064 100644 --- a/samples/client/petstore/ruby/.openapi-generator/VERSION +++ b/samples/client/petstore/ruby/.openapi-generator/VERSION @@ -1,5 +1 @@ -<<<<<<< HEAD -4.0.0-SNAPSHOT -======= -3.2.1-SNAPSHOT ->>>>>>> 3.3.x +4.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/ruby/lib/petstore.rb b/samples/client/petstore/ruby/lib/petstore.rb index d475c45d87f..4c307fb3672 100644 --- a/samples/client/petstore/ruby/lib/petstore.rb +++ b/samples/client/petstore/ruby/lib/petstore.rb @@ -6,11 +6,7 @@ OpenAPI spec version: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 4.0.0-SNAPSHOT -======= -OpenAPI Generator version: 3.2.1-SNAPSHOT ->>>>>>> 3.3.x =end diff --git a/samples/client/petstore/ruby/lib/petstore/api/another_fake_api.rb b/samples/client/petstore/ruby/lib/petstore/api/another_fake_api.rb index bb178bf1575..c9a446e3d9e 100644 --- a/samples/client/petstore/ruby/lib/petstore/api/another_fake_api.rb +++ b/samples/client/petstore/ruby/lib/petstore/api/another_fake_api.rb @@ -6,11 +6,7 @@ OpenAPI spec version: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 4.0.0-SNAPSHOT -======= -OpenAPI Generator version: 3.2.1-SNAPSHOT ->>>>>>> 3.3.x =end diff --git a/samples/client/petstore/ruby/lib/petstore/api/fake_api.rb b/samples/client/petstore/ruby/lib/petstore/api/fake_api.rb index 24a911dd468..313710cba81 100644 --- a/samples/client/petstore/ruby/lib/petstore/api/fake_api.rb +++ b/samples/client/petstore/ruby/lib/petstore/api/fake_api.rb @@ -6,11 +6,7 @@ OpenAPI spec version: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 4.0.0-SNAPSHOT -======= -OpenAPI Generator version: 3.2.1-SNAPSHOT ->>>>>>> 3.3.x =end diff --git a/samples/client/petstore/ruby/lib/petstore/api/fake_classname_tags123_api.rb b/samples/client/petstore/ruby/lib/petstore/api/fake_classname_tags123_api.rb index 71f1d6676c8..671b496e3a4 100644 --- a/samples/client/petstore/ruby/lib/petstore/api/fake_classname_tags123_api.rb +++ b/samples/client/petstore/ruby/lib/petstore/api/fake_classname_tags123_api.rb @@ -6,11 +6,7 @@ OpenAPI spec version: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 4.0.0-SNAPSHOT -======= -OpenAPI Generator version: 3.2.1-SNAPSHOT ->>>>>>> 3.3.x =end diff --git a/samples/client/petstore/ruby/lib/petstore/api/pet_api.rb b/samples/client/petstore/ruby/lib/petstore/api/pet_api.rb index 0a1ded34850..facacd8b80d 100644 --- a/samples/client/petstore/ruby/lib/petstore/api/pet_api.rb +++ b/samples/client/petstore/ruby/lib/petstore/api/pet_api.rb @@ -6,11 +6,7 @@ OpenAPI spec version: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 4.0.0-SNAPSHOT -======= -OpenAPI Generator version: 3.2.1-SNAPSHOT ->>>>>>> 3.3.x =end diff --git a/samples/client/petstore/ruby/lib/petstore/api/store_api.rb b/samples/client/petstore/ruby/lib/petstore/api/store_api.rb index d2548aa6d34..54787e93828 100644 --- a/samples/client/petstore/ruby/lib/petstore/api/store_api.rb +++ b/samples/client/petstore/ruby/lib/petstore/api/store_api.rb @@ -6,11 +6,7 @@ OpenAPI spec version: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 4.0.0-SNAPSHOT -======= -OpenAPI Generator version: 3.2.1-SNAPSHOT ->>>>>>> 3.3.x =end diff --git a/samples/client/petstore/ruby/lib/petstore/api/user_api.rb b/samples/client/petstore/ruby/lib/petstore/api/user_api.rb index 5d37b6ad1c8..61b6e73baad 100644 --- a/samples/client/petstore/ruby/lib/petstore/api/user_api.rb +++ b/samples/client/petstore/ruby/lib/petstore/api/user_api.rb @@ -6,11 +6,7 @@ OpenAPI spec version: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 4.0.0-SNAPSHOT -======= -OpenAPI Generator version: 3.2.1-SNAPSHOT ->>>>>>> 3.3.x =end diff --git a/samples/client/petstore/ruby/lib/petstore/api_client.rb b/samples/client/petstore/ruby/lib/petstore/api_client.rb index de44b515a4d..8de2c60ca7b 100644 --- a/samples/client/petstore/ruby/lib/petstore/api_client.rb +++ b/samples/client/petstore/ruby/lib/petstore/api_client.rb @@ -6,11 +6,7 @@ OpenAPI spec version: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 4.0.0-SNAPSHOT -======= -OpenAPI Generator version: 3.2.1-SNAPSHOT ->>>>>>> 3.3.x =end diff --git a/samples/client/petstore/ruby/lib/petstore/api_error.rb b/samples/client/petstore/ruby/lib/petstore/api_error.rb index a00c3ca3063..66bf1edb437 100644 --- a/samples/client/petstore/ruby/lib/petstore/api_error.rb +++ b/samples/client/petstore/ruby/lib/petstore/api_error.rb @@ -6,11 +6,7 @@ OpenAPI spec version: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 4.0.0-SNAPSHOT -======= -OpenAPI Generator version: 3.2.1-SNAPSHOT ->>>>>>> 3.3.x =end diff --git a/samples/client/petstore/ruby/lib/petstore/configuration.rb b/samples/client/petstore/ruby/lib/petstore/configuration.rb index 78b61c72fe9..40af7f1a295 100644 --- a/samples/client/petstore/ruby/lib/petstore/configuration.rb +++ b/samples/client/petstore/ruby/lib/petstore/configuration.rb @@ -6,11 +6,7 @@ OpenAPI spec version: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 4.0.0-SNAPSHOT -======= -OpenAPI Generator version: 3.2.1-SNAPSHOT ->>>>>>> 3.3.x =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/additional_properties_class.rb b/samples/client/petstore/ruby/lib/petstore/models/additional_properties_class.rb index 1139acf7f0c..14bbd6ce1bb 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/additional_properties_class.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/additional_properties_class.rb @@ -6,11 +6,7 @@ OpenAPI spec version: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 4.0.0-SNAPSHOT -======= -OpenAPI Generator version: 3.2.1-SNAPSHOT ->>>>>>> 3.3.x =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/animal.rb b/samples/client/petstore/ruby/lib/petstore/models/animal.rb index 0bba71dd7d4..bf0434c32f6 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/animal.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/animal.rb @@ -6,11 +6,7 @@ OpenAPI spec version: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 4.0.0-SNAPSHOT -======= -OpenAPI Generator version: 3.2.1-SNAPSHOT ->>>>>>> 3.3.x =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/animal_farm.rb b/samples/client/petstore/ruby/lib/petstore/models/animal_farm.rb index c0df4b4dde5..03c705c71d6 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/animal_farm.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/animal_farm.rb @@ -6,11 +6,7 @@ OpenAPI spec version: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 4.0.0-SNAPSHOT -======= -OpenAPI Generator version: 3.2.1-SNAPSHOT ->>>>>>> 3.3.x =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/api_response.rb b/samples/client/petstore/ruby/lib/petstore/models/api_response.rb index 717446b8a59..98cd00426ec 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/api_response.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/api_response.rb @@ -6,11 +6,7 @@ OpenAPI spec version: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 4.0.0-SNAPSHOT -======= -OpenAPI Generator version: 3.2.1-SNAPSHOT ->>>>>>> 3.3.x =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/array_of_array_of_number_only.rb b/samples/client/petstore/ruby/lib/petstore/models/array_of_array_of_number_only.rb index dc302ed5a5c..997b7d76013 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/array_of_array_of_number_only.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/array_of_array_of_number_only.rb @@ -6,11 +6,7 @@ OpenAPI spec version: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 4.0.0-SNAPSHOT -======= -OpenAPI Generator version: 3.2.1-SNAPSHOT ->>>>>>> 3.3.x =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/array_of_number_only.rb b/samples/client/petstore/ruby/lib/petstore/models/array_of_number_only.rb index e8a29bd94a4..c5305f99ed9 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/array_of_number_only.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/array_of_number_only.rb @@ -6,11 +6,7 @@ OpenAPI spec version: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 4.0.0-SNAPSHOT -======= -OpenAPI Generator version: 3.2.1-SNAPSHOT ->>>>>>> 3.3.x =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/array_test.rb b/samples/client/petstore/ruby/lib/petstore/models/array_test.rb index aa00919bea2..064ba67475d 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/array_test.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/array_test.rb @@ -6,11 +6,7 @@ OpenAPI spec version: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 4.0.0-SNAPSHOT -======= -OpenAPI Generator version: 3.2.1-SNAPSHOT ->>>>>>> 3.3.x =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/capitalization.rb b/samples/client/petstore/ruby/lib/petstore/models/capitalization.rb index fd4dc2aa816..67131328f2d 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/capitalization.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/capitalization.rb @@ -6,11 +6,7 @@ OpenAPI spec version: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 4.0.0-SNAPSHOT -======= -OpenAPI Generator version: 3.2.1-SNAPSHOT ->>>>>>> 3.3.x =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/cat.rb b/samples/client/petstore/ruby/lib/petstore/models/cat.rb index b704faa85d7..d2cb1452eef 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/cat.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/cat.rb @@ -6,11 +6,7 @@ OpenAPI spec version: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 4.0.0-SNAPSHOT -======= -OpenAPI Generator version: 3.2.1-SNAPSHOT ->>>>>>> 3.3.x =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/category.rb b/samples/client/petstore/ruby/lib/petstore/models/category.rb index b8527ad9e4e..77d81444877 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/category.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/category.rb @@ -6,11 +6,7 @@ OpenAPI spec version: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 4.0.0-SNAPSHOT -======= -OpenAPI Generator version: 3.2.1-SNAPSHOT ->>>>>>> 3.3.x =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/class_model.rb b/samples/client/petstore/ruby/lib/petstore/models/class_model.rb index 223a57a9bd4..f946ed55be0 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/class_model.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/class_model.rb @@ -6,11 +6,7 @@ OpenAPI spec version: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 4.0.0-SNAPSHOT -======= -OpenAPI Generator version: 3.2.1-SNAPSHOT ->>>>>>> 3.3.x =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/client.rb b/samples/client/petstore/ruby/lib/petstore/models/client.rb index 67d565396ba..eb11c6e587e 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/client.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/client.rb @@ -6,11 +6,7 @@ OpenAPI spec version: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 4.0.0-SNAPSHOT -======= -OpenAPI Generator version: 3.2.1-SNAPSHOT ->>>>>>> 3.3.x =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/dog.rb b/samples/client/petstore/ruby/lib/petstore/models/dog.rb index e46fd019e7b..49a8866a3b9 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/dog.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/dog.rb @@ -6,11 +6,7 @@ OpenAPI spec version: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 4.0.0-SNAPSHOT -======= -OpenAPI Generator version: 3.2.1-SNAPSHOT ->>>>>>> 3.3.x =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/enum_arrays.rb b/samples/client/petstore/ruby/lib/petstore/models/enum_arrays.rb index 779d24a3bf9..16a31ed6437 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/enum_arrays.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/enum_arrays.rb @@ -6,11 +6,7 @@ OpenAPI spec version: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 4.0.0-SNAPSHOT -======= -OpenAPI Generator version: 3.2.1-SNAPSHOT ->>>>>>> 3.3.x =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/enum_class.rb b/samples/client/petstore/ruby/lib/petstore/models/enum_class.rb index fc94005f595..a0b472f3c16 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/enum_class.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/enum_class.rb @@ -6,11 +6,7 @@ OpenAPI spec version: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 4.0.0-SNAPSHOT -======= -OpenAPI Generator version: 3.2.1-SNAPSHOT ->>>>>>> 3.3.x =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/enum_test.rb b/samples/client/petstore/ruby/lib/petstore/models/enum_test.rb index 1304d373dde..d0828881c03 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/enum_test.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/enum_test.rb @@ -6,11 +6,7 @@ OpenAPI spec version: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 4.0.0-SNAPSHOT -======= -OpenAPI Generator version: 3.2.1-SNAPSHOT ->>>>>>> 3.3.x =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/file.rb b/samples/client/petstore/ruby/lib/petstore/models/file.rb index 52e2e212455..9a242c87642 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/file.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/file.rb @@ -6,11 +6,7 @@ OpenAPI spec version: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 4.0.0-SNAPSHOT -======= -OpenAPI Generator version: 3.2.1-SNAPSHOT ->>>>>>> 3.3.x =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/file_schema_test_class.rb b/samples/client/petstore/ruby/lib/petstore/models/file_schema_test_class.rb index 3f3265d1a9d..15b1abc488a 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/file_schema_test_class.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/file_schema_test_class.rb @@ -6,11 +6,7 @@ OpenAPI spec version: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 4.0.0-SNAPSHOT -======= -OpenAPI Generator version: 3.2.1-SNAPSHOT ->>>>>>> 3.3.x =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/format_test.rb b/samples/client/petstore/ruby/lib/petstore/models/format_test.rb index 6a6d0a4dd5e..4dff547a851 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/format_test.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/format_test.rb @@ -6,11 +6,7 @@ OpenAPI spec version: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 4.0.0-SNAPSHOT -======= -OpenAPI Generator version: 3.2.1-SNAPSHOT ->>>>>>> 3.3.x =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/has_only_read_only.rb b/samples/client/petstore/ruby/lib/petstore/models/has_only_read_only.rb index 7f3be970892..2a34807da79 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/has_only_read_only.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/has_only_read_only.rb @@ -6,11 +6,7 @@ OpenAPI spec version: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 4.0.0-SNAPSHOT -======= -OpenAPI Generator version: 3.2.1-SNAPSHOT ->>>>>>> 3.3.x =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/list.rb b/samples/client/petstore/ruby/lib/petstore/models/list.rb index 740e7b04f5e..5edff2ea014 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/list.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/list.rb @@ -6,11 +6,7 @@ OpenAPI spec version: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 4.0.0-SNAPSHOT -======= -OpenAPI Generator version: 3.2.1-SNAPSHOT ->>>>>>> 3.3.x =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/map_test.rb b/samples/client/petstore/ruby/lib/petstore/models/map_test.rb index 2b1d8d8e03d..f546c9dc320 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/map_test.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/map_test.rb @@ -6,11 +6,7 @@ OpenAPI spec version: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 4.0.0-SNAPSHOT -======= -OpenAPI Generator version: 3.2.1-SNAPSHOT ->>>>>>> 3.3.x =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/mixed_properties_and_additional_properties_class.rb b/samples/client/petstore/ruby/lib/petstore/models/mixed_properties_and_additional_properties_class.rb index 7a0d3b4cfec..b65eeb0be55 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/mixed_properties_and_additional_properties_class.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/mixed_properties_and_additional_properties_class.rb @@ -6,11 +6,7 @@ OpenAPI spec version: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 4.0.0-SNAPSHOT -======= -OpenAPI Generator version: 3.2.1-SNAPSHOT ->>>>>>> 3.3.x =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/model200_response.rb b/samples/client/petstore/ruby/lib/petstore/models/model200_response.rb index d50ef325c4d..52dd2ab76cd 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/model200_response.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/model200_response.rb @@ -6,11 +6,7 @@ OpenAPI spec version: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 4.0.0-SNAPSHOT -======= -OpenAPI Generator version: 3.2.1-SNAPSHOT ->>>>>>> 3.3.x =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/model_return.rb b/samples/client/petstore/ruby/lib/petstore/models/model_return.rb index 48728d4d9f3..ab24fe326f8 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/model_return.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/model_return.rb @@ -6,11 +6,7 @@ OpenAPI spec version: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 4.0.0-SNAPSHOT -======= -OpenAPI Generator version: 3.2.1-SNAPSHOT ->>>>>>> 3.3.x =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/name.rb b/samples/client/petstore/ruby/lib/petstore/models/name.rb index e79dc42f54e..75aeab463e0 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/name.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/name.rb @@ -6,11 +6,7 @@ OpenAPI spec version: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 4.0.0-SNAPSHOT -======= -OpenAPI Generator version: 3.2.1-SNAPSHOT ->>>>>>> 3.3.x =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/number_only.rb b/samples/client/petstore/ruby/lib/petstore/models/number_only.rb index b24185b341e..e5d95d4d2e6 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/number_only.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/number_only.rb @@ -6,11 +6,7 @@ OpenAPI spec version: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 4.0.0-SNAPSHOT -======= -OpenAPI Generator version: 3.2.1-SNAPSHOT ->>>>>>> 3.3.x =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/order.rb b/samples/client/petstore/ruby/lib/petstore/models/order.rb index 0716ae39056..5c47cda94c5 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/order.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/order.rb @@ -6,11 +6,7 @@ OpenAPI spec version: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 4.0.0-SNAPSHOT -======= -OpenAPI Generator version: 3.2.1-SNAPSHOT ->>>>>>> 3.3.x =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/outer_composite.rb b/samples/client/petstore/ruby/lib/petstore/models/outer_composite.rb index a45c31d9dbe..5098b8e8cd3 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/outer_composite.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/outer_composite.rb @@ -6,11 +6,7 @@ OpenAPI spec version: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 4.0.0-SNAPSHOT -======= -OpenAPI Generator version: 3.2.1-SNAPSHOT ->>>>>>> 3.3.x =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/outer_enum.rb b/samples/client/petstore/ruby/lib/petstore/models/outer_enum.rb index bf11738b3dd..cec4c0ef830 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/outer_enum.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/outer_enum.rb @@ -6,11 +6,7 @@ OpenAPI spec version: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 4.0.0-SNAPSHOT -======= -OpenAPI Generator version: 3.2.1-SNAPSHOT ->>>>>>> 3.3.x =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/pet.rb b/samples/client/petstore/ruby/lib/petstore/models/pet.rb index 074f60f39c8..653c84dcc5c 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/pet.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/pet.rb @@ -6,11 +6,7 @@ OpenAPI spec version: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 4.0.0-SNAPSHOT -======= -OpenAPI Generator version: 3.2.1-SNAPSHOT ->>>>>>> 3.3.x =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/read_only_first.rb b/samples/client/petstore/ruby/lib/petstore/models/read_only_first.rb index e9a292a0a02..45bd488b6d0 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/read_only_first.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/read_only_first.rb @@ -6,11 +6,7 @@ OpenAPI spec version: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 4.0.0-SNAPSHOT -======= -OpenAPI Generator version: 3.2.1-SNAPSHOT ->>>>>>> 3.3.x =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/special_model_name.rb b/samples/client/petstore/ruby/lib/petstore/models/special_model_name.rb index 6271bf21df1..5e6428da39e 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/special_model_name.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/special_model_name.rb @@ -6,11 +6,7 @@ OpenAPI spec version: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 4.0.0-SNAPSHOT -======= -OpenAPI Generator version: 3.2.1-SNAPSHOT ->>>>>>> 3.3.x =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/string_boolean_map.rb b/samples/client/petstore/ruby/lib/petstore/models/string_boolean_map.rb index b6460e41ff1..f6cee538289 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/string_boolean_map.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/string_boolean_map.rb @@ -6,11 +6,7 @@ OpenAPI spec version: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 4.0.0-SNAPSHOT -======= -OpenAPI Generator version: 3.2.1-SNAPSHOT ->>>>>>> 3.3.x =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/tag.rb b/samples/client/petstore/ruby/lib/petstore/models/tag.rb index b8267499443..8361c631d48 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/tag.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/tag.rb @@ -6,11 +6,7 @@ OpenAPI spec version: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 4.0.0-SNAPSHOT -======= -OpenAPI Generator version: 3.2.1-SNAPSHOT ->>>>>>> 3.3.x =end diff --git a/samples/client/petstore/ruby/lib/petstore/models/user.rb b/samples/client/petstore/ruby/lib/petstore/models/user.rb index 5056cce7030..23aeb5d3d33 100644 --- a/samples/client/petstore/ruby/lib/petstore/models/user.rb +++ b/samples/client/petstore/ruby/lib/petstore/models/user.rb @@ -6,11 +6,7 @@ OpenAPI spec version: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 4.0.0-SNAPSHOT -======= -OpenAPI Generator version: 3.2.1-SNAPSHOT ->>>>>>> 3.3.x =end diff --git a/samples/client/petstore/ruby/lib/petstore/version.rb b/samples/client/petstore/ruby/lib/petstore/version.rb index 0426a5182e0..44c8c1492b3 100644 --- a/samples/client/petstore/ruby/lib/petstore/version.rb +++ b/samples/client/petstore/ruby/lib/petstore/version.rb @@ -6,11 +6,7 @@ OpenAPI spec version: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 4.0.0-SNAPSHOT -======= -OpenAPI Generator version: 3.2.1-SNAPSHOT ->>>>>>> 3.3.x =end diff --git a/samples/client/petstore/ruby/petstore.gemspec b/samples/client/petstore/ruby/petstore.gemspec index 5259937d364..77629f8f038 100644 --- a/samples/client/petstore/ruby/petstore.gemspec +++ b/samples/client/petstore/ruby/petstore.gemspec @@ -8,11 +8,7 @@ OpenAPI spec version: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 4.0.0-SNAPSHOT -======= -OpenAPI Generator version: 3.2.1-SNAPSHOT ->>>>>>> 3.3.x =end