From be991311fe99c7c36afb4b0fa81a0cd0693a1b4a Mon Sep 17 00:00:00 2001 From: William Cheng Date: Thu, 21 Nov 2019 16:28:35 +0800 Subject: [PATCH] update ruby samples --- .../ruby-faraday/spec/api/another_fake_api_spec.rb | 8 -------- .../petstore/ruby-faraday/spec/api/default_api_spec.rb | 8 -------- .../petstore/ruby-faraday/spec/api/fake_api_spec.rb | 8 -------- .../spec/api/fake_classname_tags123_api_spec.rb | 8 -------- .../client/petstore/ruby-faraday/spec/api/pet_api_spec.rb | 8 -------- .../petstore/ruby-faraday/spec/api/store_api_spec.rb | 8 -------- .../petstore/ruby-faraday/spec/api/user_api_spec.rb | 8 -------- .../client/petstore/ruby-faraday/spec/api_client_spec.rb | 8 -------- .../petstore/ruby-faraday/spec/configuration_spec.rb | 8 -------- .../spec/models/additional_properties_class_spec.rb | 8 -------- .../petstore/ruby-faraday/spec/models/animal_spec.rb | 8 -------- .../ruby-faraday/spec/models/api_response_spec.rb | 8 -------- .../spec/models/array_of_array_of_number_only_spec.rb | 8 -------- .../ruby-faraday/spec/models/array_of_number_only_spec.rb | 8 -------- .../petstore/ruby-faraday/spec/models/array_test_spec.rb | 8 -------- .../ruby-faraday/spec/models/capitalization_spec.rb | 8 -------- .../petstore/ruby-faraday/spec/models/cat_all_of_spec.rb | 8 -------- .../client/petstore/ruby-faraday/spec/models/cat_spec.rb | 8 -------- .../petstore/ruby-faraday/spec/models/category_spec.rb | 8 -------- .../petstore/ruby-faraday/spec/models/class_model_spec.rb | 8 -------- .../petstore/ruby-faraday/spec/models/client_spec.rb | 8 -------- .../petstore/ruby-faraday/spec/models/dog_all_of_spec.rb | 8 -------- .../client/petstore/ruby-faraday/spec/models/dog_spec.rb | 8 -------- .../petstore/ruby-faraday/spec/models/enum_arrays_spec.rb | 8 -------- .../petstore/ruby-faraday/spec/models/enum_class_spec.rb | 8 -------- .../petstore/ruby-faraday/spec/models/enum_test_spec.rb | 8 -------- .../spec/models/file_schema_test_class_spec.rb | 8 -------- .../client/petstore/ruby-faraday/spec/models/file_spec.rb | 8 -------- .../client/petstore/ruby-faraday/spec/models/foo_spec.rb | 8 -------- .../petstore/ruby-faraday/spec/models/format_test_spec.rb | 8 -------- .../ruby-faraday/spec/models/has_only_read_only_spec.rb | 8 -------- .../ruby-faraday/spec/models/health_check_result_spec.rb | 8 -------- .../ruby-faraday/spec/models/inline_object1_spec.rb | 8 -------- .../ruby-faraday/spec/models/inline_object2_spec.rb | 8 -------- .../ruby-faraday/spec/models/inline_object3_spec.rb | 8 -------- .../ruby-faraday/spec/models/inline_object4_spec.rb | 8 -------- .../ruby-faraday/spec/models/inline_object5_spec.rb | 8 -------- .../ruby-faraday/spec/models/inline_object_spec.rb | 8 -------- .../spec/models/inline_response_default_spec.rb | 8 -------- .../client/petstore/ruby-faraday/spec/models/list_spec.rb | 8 -------- .../petstore/ruby-faraday/spec/models/map_test_spec.rb | 8 -------- ...xed_properties_and_additional_properties_class_spec.rb | 8 -------- .../ruby-faraday/spec/models/model200_response_spec.rb | 8 -------- .../ruby-faraday/spec/models/model_return_spec.rb | 8 -------- .../client/petstore/ruby-faraday/spec/models/name_spec.rb | 8 -------- .../ruby-faraday/spec/models/nullable_class_spec.rb | 8 -------- .../petstore/ruby-faraday/spec/models/number_only_spec.rb | 8 -------- .../petstore/ruby-faraday/spec/models/order_spec.rb | 8 -------- .../ruby-faraday/spec/models/outer_composite_spec.rb | 8 -------- .../spec/models/outer_enum_default_value_spec.rb | 8 -------- .../spec/models/outer_enum_integer_default_value_spec.rb | 8 -------- .../ruby-faraday/spec/models/outer_enum_integer_spec.rb | 8 -------- .../petstore/ruby-faraday/spec/models/outer_enum_spec.rb | 8 -------- .../client/petstore/ruby-faraday/spec/models/pet_spec.rb | 8 -------- .../ruby-faraday/spec/models/read_only_first_spec.rb | 8 -------- .../ruby-faraday/spec/models/special_model_name_spec.rb | 8 -------- .../client/petstore/ruby-faraday/spec/models/tag_spec.rb | 8 -------- .../client/petstore/ruby-faraday/spec/models/user_spec.rb | 8 -------- .../client/petstore/ruby-faraday/spec/spec_helper.rb | 8 -------- 59 files changed, 472 deletions(-) diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/api/another_fake_api_spec.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/api/another_fake_api_spec.rb index ba85c6e3f3c..bf187f0971f 100644 --- a/samples/openapi3/client/petstore/ruby-faraday/spec/api/another_fake_api_spec.rb +++ b/samples/openapi3/client/petstore/ruby-faraday/spec/api/another_fake_api_spec.rb @@ -6,15 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 5.0.0-SNAPSHOT -======= -<<<<<<< HEAD -OpenAPI Generator version: 4.3.0-SNAPSHOT -======= -OpenAPI Generator version: 4.2.2-SNAPSHOT ->>>>>>> origin/master ->>>>>>> 4.3.x =end diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/api/default_api_spec.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/api/default_api_spec.rb index 849eb7fc84f..fd58eaa21a6 100644 --- a/samples/openapi3/client/petstore/ruby-faraday/spec/api/default_api_spec.rb +++ b/samples/openapi3/client/petstore/ruby-faraday/spec/api/default_api_spec.rb @@ -6,15 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 5.0.0-SNAPSHOT -======= -<<<<<<< HEAD -OpenAPI Generator version: 4.3.0-SNAPSHOT -======= -OpenAPI Generator version: 4.2.2-SNAPSHOT ->>>>>>> origin/master ->>>>>>> 4.3.x =end diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/api/fake_api_spec.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/api/fake_api_spec.rb index fd2248d226c..083a1c6ab70 100644 --- a/samples/openapi3/client/petstore/ruby-faraday/spec/api/fake_api_spec.rb +++ b/samples/openapi3/client/petstore/ruby-faraday/spec/api/fake_api_spec.rb @@ -6,15 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 5.0.0-SNAPSHOT -======= -<<<<<<< HEAD -OpenAPI Generator version: 4.3.0-SNAPSHOT -======= -OpenAPI Generator version: 4.2.2-SNAPSHOT ->>>>>>> origin/master ->>>>>>> 4.3.x =end diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/api/fake_classname_tags123_api_spec.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/api/fake_classname_tags123_api_spec.rb index 709f74be6ec..1db2b3c9ef5 100644 --- a/samples/openapi3/client/petstore/ruby-faraday/spec/api/fake_classname_tags123_api_spec.rb +++ b/samples/openapi3/client/petstore/ruby-faraday/spec/api/fake_classname_tags123_api_spec.rb @@ -6,15 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 5.0.0-SNAPSHOT -======= -<<<<<<< HEAD -OpenAPI Generator version: 4.3.0-SNAPSHOT -======= -OpenAPI Generator version: 4.2.2-SNAPSHOT ->>>>>>> origin/master ->>>>>>> 4.3.x =end diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/api/pet_api_spec.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/api/pet_api_spec.rb index fae3e57680b..26ca32b2f75 100644 --- a/samples/openapi3/client/petstore/ruby-faraday/spec/api/pet_api_spec.rb +++ b/samples/openapi3/client/petstore/ruby-faraday/spec/api/pet_api_spec.rb @@ -6,15 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 5.0.0-SNAPSHOT -======= -<<<<<<< HEAD -OpenAPI Generator version: 4.3.0-SNAPSHOT -======= -OpenAPI Generator version: 4.2.2-SNAPSHOT ->>>>>>> origin/master ->>>>>>> 4.3.x =end diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/api/store_api_spec.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/api/store_api_spec.rb index e8bf668c36b..1fd9faf40aa 100644 --- a/samples/openapi3/client/petstore/ruby-faraday/spec/api/store_api_spec.rb +++ b/samples/openapi3/client/petstore/ruby-faraday/spec/api/store_api_spec.rb @@ -6,15 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 5.0.0-SNAPSHOT -======= -<<<<<<< HEAD -OpenAPI Generator version: 4.3.0-SNAPSHOT -======= -OpenAPI Generator version: 4.2.2-SNAPSHOT ->>>>>>> origin/master ->>>>>>> 4.3.x =end diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/api/user_api_spec.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/api/user_api_spec.rb index 3f18d5f8916..39178c5a5ac 100644 --- a/samples/openapi3/client/petstore/ruby-faraday/spec/api/user_api_spec.rb +++ b/samples/openapi3/client/petstore/ruby-faraday/spec/api/user_api_spec.rb @@ -6,15 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 5.0.0-SNAPSHOT -======= -<<<<<<< HEAD -OpenAPI Generator version: 4.3.0-SNAPSHOT -======= -OpenAPI Generator version: 4.2.2-SNAPSHOT ->>>>>>> origin/master ->>>>>>> 4.3.x =end diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/api_client_spec.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/api_client_spec.rb index e8f46f6cc5f..70e29586d38 100644 --- a/samples/openapi3/client/petstore/ruby-faraday/spec/api_client_spec.rb +++ b/samples/openapi3/client/petstore/ruby-faraday/spec/api_client_spec.rb @@ -6,15 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 5.0.0-SNAPSHOT -======= -<<<<<<< HEAD -OpenAPI Generator version: 4.3.0-SNAPSHOT -======= -OpenAPI Generator version: 4.2.2-SNAPSHOT ->>>>>>> origin/master ->>>>>>> 4.3.x =end diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/configuration_spec.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/configuration_spec.rb index be549c30bc4..0bea24033c6 100644 --- a/samples/openapi3/client/petstore/ruby-faraday/spec/configuration_spec.rb +++ b/samples/openapi3/client/petstore/ruby-faraday/spec/configuration_spec.rb @@ -6,15 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 5.0.0-SNAPSHOT -======= -<<<<<<< HEAD -OpenAPI Generator version: 4.3.0-SNAPSHOT -======= -OpenAPI Generator version: 4.2.2-SNAPSHOT ->>>>>>> origin/master ->>>>>>> 4.3.x =end diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/models/additional_properties_class_spec.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/models/additional_properties_class_spec.rb index c6a0b48b485..93a5b0d5fb4 100644 --- a/samples/openapi3/client/petstore/ruby-faraday/spec/models/additional_properties_class_spec.rb +++ b/samples/openapi3/client/petstore/ruby-faraday/spec/models/additional_properties_class_spec.rb @@ -6,15 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 5.0.0-SNAPSHOT -======= -<<<<<<< HEAD -OpenAPI Generator version: 4.3.0-SNAPSHOT -======= -OpenAPI Generator version: 4.2.2-SNAPSHOT ->>>>>>> origin/master ->>>>>>> 4.3.x =end diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/models/animal_spec.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/models/animal_spec.rb index 886387d824c..8b3e9adc537 100644 --- a/samples/openapi3/client/petstore/ruby-faraday/spec/models/animal_spec.rb +++ b/samples/openapi3/client/petstore/ruby-faraday/spec/models/animal_spec.rb @@ -6,15 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 5.0.0-SNAPSHOT -======= -<<<<<<< HEAD -OpenAPI Generator version: 4.3.0-SNAPSHOT -======= -OpenAPI Generator version: 4.2.2-SNAPSHOT ->>>>>>> origin/master ->>>>>>> 4.3.x =end diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/models/api_response_spec.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/models/api_response_spec.rb index 7bb27bc462f..628f1c4d7c1 100644 --- a/samples/openapi3/client/petstore/ruby-faraday/spec/models/api_response_spec.rb +++ b/samples/openapi3/client/petstore/ruby-faraday/spec/models/api_response_spec.rb @@ -6,15 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 5.0.0-SNAPSHOT -======= -<<<<<<< HEAD -OpenAPI Generator version: 4.3.0-SNAPSHOT -======= -OpenAPI Generator version: 4.2.2-SNAPSHOT ->>>>>>> origin/master ->>>>>>> 4.3.x =end diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/models/array_of_array_of_number_only_spec.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/models/array_of_array_of_number_only_spec.rb index 9fd8b1dcf17..ea41c9a4b38 100644 --- a/samples/openapi3/client/petstore/ruby-faraday/spec/models/array_of_array_of_number_only_spec.rb +++ b/samples/openapi3/client/petstore/ruby-faraday/spec/models/array_of_array_of_number_only_spec.rb @@ -6,15 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 5.0.0-SNAPSHOT -======= -<<<<<<< HEAD -OpenAPI Generator version: 4.3.0-SNAPSHOT -======= -OpenAPI Generator version: 4.2.2-SNAPSHOT ->>>>>>> origin/master ->>>>>>> 4.3.x =end diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/models/array_of_number_only_spec.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/models/array_of_number_only_spec.rb index 7a7ce9edcff..ba90932a797 100644 --- a/samples/openapi3/client/petstore/ruby-faraday/spec/models/array_of_number_only_spec.rb +++ b/samples/openapi3/client/petstore/ruby-faraday/spec/models/array_of_number_only_spec.rb @@ -6,15 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 5.0.0-SNAPSHOT -======= -<<<<<<< HEAD -OpenAPI Generator version: 4.3.0-SNAPSHOT -======= -OpenAPI Generator version: 4.2.2-SNAPSHOT ->>>>>>> origin/master ->>>>>>> 4.3.x =end diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/models/array_test_spec.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/models/array_test_spec.rb index c9309afc0b8..6ff7397ad43 100644 --- a/samples/openapi3/client/petstore/ruby-faraday/spec/models/array_test_spec.rb +++ b/samples/openapi3/client/petstore/ruby-faraday/spec/models/array_test_spec.rb @@ -6,15 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 5.0.0-SNAPSHOT -======= -<<<<<<< HEAD -OpenAPI Generator version: 4.3.0-SNAPSHOT -======= -OpenAPI Generator version: 4.2.2-SNAPSHOT ->>>>>>> origin/master ->>>>>>> 4.3.x =end diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/models/capitalization_spec.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/models/capitalization_spec.rb index 029ad6883af..451c59af970 100644 --- a/samples/openapi3/client/petstore/ruby-faraday/spec/models/capitalization_spec.rb +++ b/samples/openapi3/client/petstore/ruby-faraday/spec/models/capitalization_spec.rb @@ -6,15 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 5.0.0-SNAPSHOT -======= -<<<<<<< HEAD -OpenAPI Generator version: 4.3.0-SNAPSHOT -======= -OpenAPI Generator version: 4.2.2-SNAPSHOT ->>>>>>> origin/master ->>>>>>> 4.3.x =end diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/models/cat_all_of_spec.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/models/cat_all_of_spec.rb index 2d12de79ff1..926ce8a2a37 100644 --- a/samples/openapi3/client/petstore/ruby-faraday/spec/models/cat_all_of_spec.rb +++ b/samples/openapi3/client/petstore/ruby-faraday/spec/models/cat_all_of_spec.rb @@ -6,15 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 5.0.0-SNAPSHOT -======= -<<<<<<< HEAD -OpenAPI Generator version: 4.3.0-SNAPSHOT -======= -OpenAPI Generator version: 4.2.2-SNAPSHOT ->>>>>>> origin/master ->>>>>>> 4.3.x =end diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/models/cat_spec.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/models/cat_spec.rb index 2a2d12469ff..3efb677ce64 100644 --- a/samples/openapi3/client/petstore/ruby-faraday/spec/models/cat_spec.rb +++ b/samples/openapi3/client/petstore/ruby-faraday/spec/models/cat_spec.rb @@ -6,15 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 5.0.0-SNAPSHOT -======= -<<<<<<< HEAD -OpenAPI Generator version: 4.3.0-SNAPSHOT -======= -OpenAPI Generator version: 4.2.2-SNAPSHOT ->>>>>>> origin/master ->>>>>>> 4.3.x =end diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/models/category_spec.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/models/category_spec.rb index 76cd7315703..82ecd78d966 100644 --- a/samples/openapi3/client/petstore/ruby-faraday/spec/models/category_spec.rb +++ b/samples/openapi3/client/petstore/ruby-faraday/spec/models/category_spec.rb @@ -6,15 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 5.0.0-SNAPSHOT -======= -<<<<<<< HEAD -OpenAPI Generator version: 4.3.0-SNAPSHOT -======= -OpenAPI Generator version: 4.2.2-SNAPSHOT ->>>>>>> origin/master ->>>>>>> 4.3.x =end diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/models/class_model_spec.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/models/class_model_spec.rb index 2d4b19e484c..761e8933127 100644 --- a/samples/openapi3/client/petstore/ruby-faraday/spec/models/class_model_spec.rb +++ b/samples/openapi3/client/petstore/ruby-faraday/spec/models/class_model_spec.rb @@ -6,15 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 5.0.0-SNAPSHOT -======= -<<<<<<< HEAD -OpenAPI Generator version: 4.3.0-SNAPSHOT -======= -OpenAPI Generator version: 4.2.2-SNAPSHOT ->>>>>>> origin/master ->>>>>>> 4.3.x =end diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/models/client_spec.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/models/client_spec.rb index c7d3f30c794..4bf1ce0622b 100644 --- a/samples/openapi3/client/petstore/ruby-faraday/spec/models/client_spec.rb +++ b/samples/openapi3/client/petstore/ruby-faraday/spec/models/client_spec.rb @@ -6,15 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 5.0.0-SNAPSHOT -======= -<<<<<<< HEAD -OpenAPI Generator version: 4.3.0-SNAPSHOT -======= -OpenAPI Generator version: 4.2.2-SNAPSHOT ->>>>>>> origin/master ->>>>>>> 4.3.x =end diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/models/dog_all_of_spec.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/models/dog_all_of_spec.rb index c5a90f6018d..5596927d423 100644 --- a/samples/openapi3/client/petstore/ruby-faraday/spec/models/dog_all_of_spec.rb +++ b/samples/openapi3/client/petstore/ruby-faraday/spec/models/dog_all_of_spec.rb @@ -6,15 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 5.0.0-SNAPSHOT -======= -<<<<<<< HEAD -OpenAPI Generator version: 4.3.0-SNAPSHOT -======= -OpenAPI Generator version: 4.2.2-SNAPSHOT ->>>>>>> origin/master ->>>>>>> 4.3.x =end diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/models/dog_spec.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/models/dog_spec.rb index 2905492a554..b82df3e9d72 100644 --- a/samples/openapi3/client/petstore/ruby-faraday/spec/models/dog_spec.rb +++ b/samples/openapi3/client/petstore/ruby-faraday/spec/models/dog_spec.rb @@ -6,15 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 5.0.0-SNAPSHOT -======= -<<<<<<< HEAD -OpenAPI Generator version: 4.3.0-SNAPSHOT -======= -OpenAPI Generator version: 4.2.2-SNAPSHOT ->>>>>>> origin/master ->>>>>>> 4.3.x =end diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/models/enum_arrays_spec.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/models/enum_arrays_spec.rb index 469000b386c..ac75c92581d 100644 --- a/samples/openapi3/client/petstore/ruby-faraday/spec/models/enum_arrays_spec.rb +++ b/samples/openapi3/client/petstore/ruby-faraday/spec/models/enum_arrays_spec.rb @@ -6,15 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 5.0.0-SNAPSHOT -======= -<<<<<<< HEAD -OpenAPI Generator version: 4.3.0-SNAPSHOT -======= -OpenAPI Generator version: 4.2.2-SNAPSHOT ->>>>>>> origin/master ->>>>>>> 4.3.x =end diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/models/enum_class_spec.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/models/enum_class_spec.rb index 97a4dde432d..29fcd05aa75 100644 --- a/samples/openapi3/client/petstore/ruby-faraday/spec/models/enum_class_spec.rb +++ b/samples/openapi3/client/petstore/ruby-faraday/spec/models/enum_class_spec.rb @@ -6,15 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 5.0.0-SNAPSHOT -======= -<<<<<<< HEAD -OpenAPI Generator version: 4.3.0-SNAPSHOT -======= -OpenAPI Generator version: 4.2.2-SNAPSHOT ->>>>>>> origin/master ->>>>>>> 4.3.x =end diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/models/enum_test_spec.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/models/enum_test_spec.rb index f941b279847..7f4c9c97e87 100644 --- a/samples/openapi3/client/petstore/ruby-faraday/spec/models/enum_test_spec.rb +++ b/samples/openapi3/client/petstore/ruby-faraday/spec/models/enum_test_spec.rb @@ -6,15 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 5.0.0-SNAPSHOT -======= -<<<<<<< HEAD -OpenAPI Generator version: 4.3.0-SNAPSHOT -======= -OpenAPI Generator version: 4.2.2-SNAPSHOT ->>>>>>> origin/master ->>>>>>> 4.3.x =end diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/models/file_schema_test_class_spec.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/models/file_schema_test_class_spec.rb index bcc36bfe20a..8a8d92658c9 100644 --- a/samples/openapi3/client/petstore/ruby-faraday/spec/models/file_schema_test_class_spec.rb +++ b/samples/openapi3/client/petstore/ruby-faraday/spec/models/file_schema_test_class_spec.rb @@ -6,15 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 5.0.0-SNAPSHOT -======= -<<<<<<< HEAD -OpenAPI Generator version: 4.3.0-SNAPSHOT -======= -OpenAPI Generator version: 4.2.2-SNAPSHOT ->>>>>>> origin/master ->>>>>>> 4.3.x =end diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/models/file_spec.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/models/file_spec.rb index adbc136d4f1..b9d1499766e 100644 --- a/samples/openapi3/client/petstore/ruby-faraday/spec/models/file_spec.rb +++ b/samples/openapi3/client/petstore/ruby-faraday/spec/models/file_spec.rb @@ -6,15 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 5.0.0-SNAPSHOT -======= -<<<<<<< HEAD -OpenAPI Generator version: 4.3.0-SNAPSHOT -======= -OpenAPI Generator version: 4.2.2-SNAPSHOT ->>>>>>> origin/master ->>>>>>> 4.3.x =end diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/models/foo_spec.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/models/foo_spec.rb index 12c728a81ef..46f8aa8a1d9 100644 --- a/samples/openapi3/client/petstore/ruby-faraday/spec/models/foo_spec.rb +++ b/samples/openapi3/client/petstore/ruby-faraday/spec/models/foo_spec.rb @@ -6,15 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 5.0.0-SNAPSHOT -======= -<<<<<<< HEAD -OpenAPI Generator version: 4.3.0-SNAPSHOT -======= -OpenAPI Generator version: 4.2.2-SNAPSHOT ->>>>>>> origin/master ->>>>>>> 4.3.x =end diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/models/format_test_spec.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/models/format_test_spec.rb index 5f86929ddac..72fe239f298 100644 --- a/samples/openapi3/client/petstore/ruby-faraday/spec/models/format_test_spec.rb +++ b/samples/openapi3/client/petstore/ruby-faraday/spec/models/format_test_spec.rb @@ -6,15 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 5.0.0-SNAPSHOT -======= -<<<<<<< HEAD -OpenAPI Generator version: 4.3.0-SNAPSHOT -======= -OpenAPI Generator version: 4.2.2-SNAPSHOT ->>>>>>> origin/master ->>>>>>> 4.3.x =end diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/models/has_only_read_only_spec.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/models/has_only_read_only_spec.rb index be2313b3cc3..9efa03a22fe 100644 --- a/samples/openapi3/client/petstore/ruby-faraday/spec/models/has_only_read_only_spec.rb +++ b/samples/openapi3/client/petstore/ruby-faraday/spec/models/has_only_read_only_spec.rb @@ -6,15 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 5.0.0-SNAPSHOT -======= -<<<<<<< HEAD -OpenAPI Generator version: 4.3.0-SNAPSHOT -======= -OpenAPI Generator version: 4.2.2-SNAPSHOT ->>>>>>> origin/master ->>>>>>> 4.3.x =end diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/models/health_check_result_spec.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/models/health_check_result_spec.rb index cc56759d60c..e90a77ec8a7 100644 --- a/samples/openapi3/client/petstore/ruby-faraday/spec/models/health_check_result_spec.rb +++ b/samples/openapi3/client/petstore/ruby-faraday/spec/models/health_check_result_spec.rb @@ -6,15 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 5.0.0-SNAPSHOT -======= -<<<<<<< HEAD -OpenAPI Generator version: 4.3.0-SNAPSHOT -======= -OpenAPI Generator version: 4.2.2-SNAPSHOT ->>>>>>> origin/master ->>>>>>> 4.3.x =end diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/models/inline_object1_spec.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/models/inline_object1_spec.rb index 2fa693e50c1..a702fd774ea 100644 --- a/samples/openapi3/client/petstore/ruby-faraday/spec/models/inline_object1_spec.rb +++ b/samples/openapi3/client/petstore/ruby-faraday/spec/models/inline_object1_spec.rb @@ -6,15 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 5.0.0-SNAPSHOT -======= -<<<<<<< HEAD -OpenAPI Generator version: 4.3.0-SNAPSHOT -======= -OpenAPI Generator version: 4.2.2-SNAPSHOT ->>>>>>> origin/master ->>>>>>> 4.3.x =end diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/models/inline_object2_spec.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/models/inline_object2_spec.rb index 81c4e66d682..7013915ea39 100644 --- a/samples/openapi3/client/petstore/ruby-faraday/spec/models/inline_object2_spec.rb +++ b/samples/openapi3/client/petstore/ruby-faraday/spec/models/inline_object2_spec.rb @@ -6,15 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 5.0.0-SNAPSHOT -======= -<<<<<<< HEAD -OpenAPI Generator version: 4.3.0-SNAPSHOT -======= -OpenAPI Generator version: 4.2.2-SNAPSHOT ->>>>>>> origin/master ->>>>>>> 4.3.x =end diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/models/inline_object3_spec.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/models/inline_object3_spec.rb index e48705131e4..4daf41b4ace 100644 --- a/samples/openapi3/client/petstore/ruby-faraday/spec/models/inline_object3_spec.rb +++ b/samples/openapi3/client/petstore/ruby-faraday/spec/models/inline_object3_spec.rb @@ -6,15 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 5.0.0-SNAPSHOT -======= -<<<<<<< HEAD -OpenAPI Generator version: 4.3.0-SNAPSHOT -======= -OpenAPI Generator version: 4.2.2-SNAPSHOT ->>>>>>> origin/master ->>>>>>> 4.3.x =end diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/models/inline_object4_spec.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/models/inline_object4_spec.rb index 3048ccc09c1..fa806f95860 100644 --- a/samples/openapi3/client/petstore/ruby-faraday/spec/models/inline_object4_spec.rb +++ b/samples/openapi3/client/petstore/ruby-faraday/spec/models/inline_object4_spec.rb @@ -6,15 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 5.0.0-SNAPSHOT -======= -<<<<<<< HEAD -OpenAPI Generator version: 4.3.0-SNAPSHOT -======= -OpenAPI Generator version: 4.2.2-SNAPSHOT ->>>>>>> origin/master ->>>>>>> 4.3.x =end diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/models/inline_object5_spec.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/models/inline_object5_spec.rb index 65c507c9047..e2410b21bc0 100644 --- a/samples/openapi3/client/petstore/ruby-faraday/spec/models/inline_object5_spec.rb +++ b/samples/openapi3/client/petstore/ruby-faraday/spec/models/inline_object5_spec.rb @@ -6,15 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 5.0.0-SNAPSHOT -======= -<<<<<<< HEAD -OpenAPI Generator version: 4.3.0-SNAPSHOT -======= -OpenAPI Generator version: 4.2.2-SNAPSHOT ->>>>>>> origin/master ->>>>>>> 4.3.x =end diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/models/inline_object_spec.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/models/inline_object_spec.rb index 56ebea5683c..c5a7db44780 100644 --- a/samples/openapi3/client/petstore/ruby-faraday/spec/models/inline_object_spec.rb +++ b/samples/openapi3/client/petstore/ruby-faraday/spec/models/inline_object_spec.rb @@ -6,15 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 5.0.0-SNAPSHOT -======= -<<<<<<< HEAD -OpenAPI Generator version: 4.3.0-SNAPSHOT -======= -OpenAPI Generator version: 4.2.2-SNAPSHOT ->>>>>>> origin/master ->>>>>>> 4.3.x =end diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/models/inline_response_default_spec.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/models/inline_response_default_spec.rb index f28d0d9d341..812470131b9 100644 --- a/samples/openapi3/client/petstore/ruby-faraday/spec/models/inline_response_default_spec.rb +++ b/samples/openapi3/client/petstore/ruby-faraday/spec/models/inline_response_default_spec.rb @@ -6,15 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 5.0.0-SNAPSHOT -======= -<<<<<<< HEAD -OpenAPI Generator version: 4.3.0-SNAPSHOT -======= -OpenAPI Generator version: 4.2.2-SNAPSHOT ->>>>>>> origin/master ->>>>>>> 4.3.x =end diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/models/list_spec.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/models/list_spec.rb index 6e5c2ba353a..db397aa108f 100644 --- a/samples/openapi3/client/petstore/ruby-faraday/spec/models/list_spec.rb +++ b/samples/openapi3/client/petstore/ruby-faraday/spec/models/list_spec.rb @@ -6,15 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 5.0.0-SNAPSHOT -======= -<<<<<<< HEAD -OpenAPI Generator version: 4.3.0-SNAPSHOT -======= -OpenAPI Generator version: 4.2.2-SNAPSHOT ->>>>>>> origin/master ->>>>>>> 4.3.x =end diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/models/map_test_spec.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/models/map_test_spec.rb index 1cb78a21bfc..f7ff6788b09 100644 --- a/samples/openapi3/client/petstore/ruby-faraday/spec/models/map_test_spec.rb +++ b/samples/openapi3/client/petstore/ruby-faraday/spec/models/map_test_spec.rb @@ -6,15 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 5.0.0-SNAPSHOT -======= -<<<<<<< HEAD -OpenAPI Generator version: 4.3.0-SNAPSHOT -======= -OpenAPI Generator version: 4.2.2-SNAPSHOT ->>>>>>> origin/master ->>>>>>> 4.3.x =end diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/models/mixed_properties_and_additional_properties_class_spec.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/models/mixed_properties_and_additional_properties_class_spec.rb index 0a6dbed9975..0e88f472524 100644 --- a/samples/openapi3/client/petstore/ruby-faraday/spec/models/mixed_properties_and_additional_properties_class_spec.rb +++ b/samples/openapi3/client/petstore/ruby-faraday/spec/models/mixed_properties_and_additional_properties_class_spec.rb @@ -6,15 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 5.0.0-SNAPSHOT -======= -<<<<<<< HEAD -OpenAPI Generator version: 4.3.0-SNAPSHOT -======= -OpenAPI Generator version: 4.2.2-SNAPSHOT ->>>>>>> origin/master ->>>>>>> 4.3.x =end diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/models/model200_response_spec.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/models/model200_response_spec.rb index 47782594793..133f6b94c14 100644 --- a/samples/openapi3/client/petstore/ruby-faraday/spec/models/model200_response_spec.rb +++ b/samples/openapi3/client/petstore/ruby-faraday/spec/models/model200_response_spec.rb @@ -6,15 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 5.0.0-SNAPSHOT -======= -<<<<<<< HEAD -OpenAPI Generator version: 4.3.0-SNAPSHOT -======= -OpenAPI Generator version: 4.2.2-SNAPSHOT ->>>>>>> origin/master ->>>>>>> 4.3.x =end diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/models/model_return_spec.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/models/model_return_spec.rb index 7b28f5bcf04..57d400eb116 100644 --- a/samples/openapi3/client/petstore/ruby-faraday/spec/models/model_return_spec.rb +++ b/samples/openapi3/client/petstore/ruby-faraday/spec/models/model_return_spec.rb @@ -6,15 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 5.0.0-SNAPSHOT -======= -<<<<<<< HEAD -OpenAPI Generator version: 4.3.0-SNAPSHOT -======= -OpenAPI Generator version: 4.2.2-SNAPSHOT ->>>>>>> origin/master ->>>>>>> 4.3.x =end diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/models/name_spec.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/models/name_spec.rb index aedde807f31..c882db4f221 100644 --- a/samples/openapi3/client/petstore/ruby-faraday/spec/models/name_spec.rb +++ b/samples/openapi3/client/petstore/ruby-faraday/spec/models/name_spec.rb @@ -6,15 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 5.0.0-SNAPSHOT -======= -<<<<<<< HEAD -OpenAPI Generator version: 4.3.0-SNAPSHOT -======= -OpenAPI Generator version: 4.2.2-SNAPSHOT ->>>>>>> origin/master ->>>>>>> 4.3.x =end diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/models/nullable_class_spec.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/models/nullable_class_spec.rb index caf5923232f..f1301d0a83d 100644 --- a/samples/openapi3/client/petstore/ruby-faraday/spec/models/nullable_class_spec.rb +++ b/samples/openapi3/client/petstore/ruby-faraday/spec/models/nullable_class_spec.rb @@ -6,15 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 5.0.0-SNAPSHOT -======= -<<<<<<< HEAD -OpenAPI Generator version: 4.3.0-SNAPSHOT -======= -OpenAPI Generator version: 4.2.2-SNAPSHOT ->>>>>>> origin/master ->>>>>>> 4.3.x =end diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/models/number_only_spec.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/models/number_only_spec.rb index 0a06e9682ee..0963591fcc1 100644 --- a/samples/openapi3/client/petstore/ruby-faraday/spec/models/number_only_spec.rb +++ b/samples/openapi3/client/petstore/ruby-faraday/spec/models/number_only_spec.rb @@ -6,15 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 5.0.0-SNAPSHOT -======= -<<<<<<< HEAD -OpenAPI Generator version: 4.3.0-SNAPSHOT -======= -OpenAPI Generator version: 4.2.2-SNAPSHOT ->>>>>>> origin/master ->>>>>>> 4.3.x =end diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/models/order_spec.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/models/order_spec.rb index fa3243537c0..3f1d973b275 100644 --- a/samples/openapi3/client/petstore/ruby-faraday/spec/models/order_spec.rb +++ b/samples/openapi3/client/petstore/ruby-faraday/spec/models/order_spec.rb @@ -6,15 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 5.0.0-SNAPSHOT -======= -<<<<<<< HEAD -OpenAPI Generator version: 4.3.0-SNAPSHOT -======= -OpenAPI Generator version: 4.2.2-SNAPSHOT ->>>>>>> origin/master ->>>>>>> 4.3.x =end diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/models/outer_composite_spec.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/models/outer_composite_spec.rb index 80b636a0e54..bb36f488959 100644 --- a/samples/openapi3/client/petstore/ruby-faraday/spec/models/outer_composite_spec.rb +++ b/samples/openapi3/client/petstore/ruby-faraday/spec/models/outer_composite_spec.rb @@ -6,15 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 5.0.0-SNAPSHOT -======= -<<<<<<< HEAD -OpenAPI Generator version: 4.3.0-SNAPSHOT -======= -OpenAPI Generator version: 4.2.2-SNAPSHOT ->>>>>>> origin/master ->>>>>>> 4.3.x =end diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/models/outer_enum_default_value_spec.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/models/outer_enum_default_value_spec.rb index 7a2bf72d783..7bd96a7abaf 100644 --- a/samples/openapi3/client/petstore/ruby-faraday/spec/models/outer_enum_default_value_spec.rb +++ b/samples/openapi3/client/petstore/ruby-faraday/spec/models/outer_enum_default_value_spec.rb @@ -6,15 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 5.0.0-SNAPSHOT -======= -<<<<<<< HEAD -OpenAPI Generator version: 4.3.0-SNAPSHOT -======= -OpenAPI Generator version: 4.2.2-SNAPSHOT ->>>>>>> origin/master ->>>>>>> 4.3.x =end diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/models/outer_enum_integer_default_value_spec.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/models/outer_enum_integer_default_value_spec.rb index 9d6135e0fbd..48a94827e56 100644 --- a/samples/openapi3/client/petstore/ruby-faraday/spec/models/outer_enum_integer_default_value_spec.rb +++ b/samples/openapi3/client/petstore/ruby-faraday/spec/models/outer_enum_integer_default_value_spec.rb @@ -6,15 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 5.0.0-SNAPSHOT -======= -<<<<<<< HEAD -OpenAPI Generator version: 4.3.0-SNAPSHOT -======= -OpenAPI Generator version: 4.2.2-SNAPSHOT ->>>>>>> origin/master ->>>>>>> 4.3.x =end diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/models/outer_enum_integer_spec.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/models/outer_enum_integer_spec.rb index 1b7a86373c1..a0ac4c81f07 100644 --- a/samples/openapi3/client/petstore/ruby-faraday/spec/models/outer_enum_integer_spec.rb +++ b/samples/openapi3/client/petstore/ruby-faraday/spec/models/outer_enum_integer_spec.rb @@ -6,15 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 5.0.0-SNAPSHOT -======= -<<<<<<< HEAD -OpenAPI Generator version: 4.3.0-SNAPSHOT -======= -OpenAPI Generator version: 4.2.2-SNAPSHOT ->>>>>>> origin/master ->>>>>>> 4.3.x =end diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/models/outer_enum_spec.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/models/outer_enum_spec.rb index bd722d47f46..ea9762da93b 100644 --- a/samples/openapi3/client/petstore/ruby-faraday/spec/models/outer_enum_spec.rb +++ b/samples/openapi3/client/petstore/ruby-faraday/spec/models/outer_enum_spec.rb @@ -6,15 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 5.0.0-SNAPSHOT -======= -<<<<<<< HEAD -OpenAPI Generator version: 4.3.0-SNAPSHOT -======= -OpenAPI Generator version: 4.2.2-SNAPSHOT ->>>>>>> origin/master ->>>>>>> 4.3.x =end diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/models/pet_spec.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/models/pet_spec.rb index c2c85b82c27..dc0a0898c9f 100644 --- a/samples/openapi3/client/petstore/ruby-faraday/spec/models/pet_spec.rb +++ b/samples/openapi3/client/petstore/ruby-faraday/spec/models/pet_spec.rb @@ -6,15 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 5.0.0-SNAPSHOT -======= -<<<<<<< HEAD -OpenAPI Generator version: 4.3.0-SNAPSHOT -======= -OpenAPI Generator version: 4.2.2-SNAPSHOT ->>>>>>> origin/master ->>>>>>> 4.3.x =end diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/models/read_only_first_spec.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/models/read_only_first_spec.rb index 4ab95118e9f..8d60e443313 100644 --- a/samples/openapi3/client/petstore/ruby-faraday/spec/models/read_only_first_spec.rb +++ b/samples/openapi3/client/petstore/ruby-faraday/spec/models/read_only_first_spec.rb @@ -6,15 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 5.0.0-SNAPSHOT -======= -<<<<<<< HEAD -OpenAPI Generator version: 4.3.0-SNAPSHOT -======= -OpenAPI Generator version: 4.2.2-SNAPSHOT ->>>>>>> origin/master ->>>>>>> 4.3.x =end diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/models/special_model_name_spec.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/models/special_model_name_spec.rb index 8ca6493d9c8..b548f7f0951 100644 --- a/samples/openapi3/client/petstore/ruby-faraday/spec/models/special_model_name_spec.rb +++ b/samples/openapi3/client/petstore/ruby-faraday/spec/models/special_model_name_spec.rb @@ -6,15 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 5.0.0-SNAPSHOT -======= -<<<<<<< HEAD -OpenAPI Generator version: 4.3.0-SNAPSHOT -======= -OpenAPI Generator version: 4.2.2-SNAPSHOT ->>>>>>> origin/master ->>>>>>> 4.3.x =end diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/models/tag_spec.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/models/tag_spec.rb index f0eab291f5a..3a745439040 100644 --- a/samples/openapi3/client/petstore/ruby-faraday/spec/models/tag_spec.rb +++ b/samples/openapi3/client/petstore/ruby-faraday/spec/models/tag_spec.rb @@ -6,15 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 5.0.0-SNAPSHOT -======= -<<<<<<< HEAD -OpenAPI Generator version: 4.3.0-SNAPSHOT -======= -OpenAPI Generator version: 4.2.2-SNAPSHOT ->>>>>>> origin/master ->>>>>>> 4.3.x =end diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/models/user_spec.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/models/user_spec.rb index 58cc20d1215..2eb31e993a0 100644 --- a/samples/openapi3/client/petstore/ruby-faraday/spec/models/user_spec.rb +++ b/samples/openapi3/client/petstore/ruby-faraday/spec/models/user_spec.rb @@ -6,15 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 5.0.0-SNAPSHOT -======= -<<<<<<< HEAD -OpenAPI Generator version: 4.3.0-SNAPSHOT -======= -OpenAPI Generator version: 4.2.2-SNAPSHOT ->>>>>>> origin/master ->>>>>>> 4.3.x =end diff --git a/samples/openapi3/client/petstore/ruby-faraday/spec/spec_helper.rb b/samples/openapi3/client/petstore/ruby-faraday/spec/spec_helper.rb index b61ebfca154..64dcf6b8f47 100644 --- a/samples/openapi3/client/petstore/ruby-faraday/spec/spec_helper.rb +++ b/samples/openapi3/client/petstore/ruby-faraday/spec/spec_helper.rb @@ -6,15 +6,7 @@ The version of the OpenAPI document: 1.0.0 Generated by: https://openapi-generator.tech -<<<<<<< HEAD OpenAPI Generator version: 5.0.0-SNAPSHOT -======= -<<<<<<< HEAD -OpenAPI Generator version: 4.3.0-SNAPSHOT -======= -OpenAPI Generator version: 4.2.2-SNAPSHOT ->>>>>>> origin/master ->>>>>>> 4.3.x =end