Merge remote-tracking branch 'origin/master' into 4.1.x

2025-12-09 04:06:11 +00:00 · 2019-06-03 00:06:43 +08:00
parent 98348a9ee6 b74fa4458d
commit 8d3a1a5add
1959 changed files with 24161 additions and 4878 deletions
--- a/samples/client/petstore/javascript-promise/src/ApiClient.js
+++ b/samples/client/petstore/javascript-promise/src/ApiClient.js
@@ -7,7 +7,11 @@
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 * https://openapi-generator.tech
 *
+<<<<<<< HEAD
 * OpenAPI Generator version: 4.1.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.0.2-SNAPSHOT
+>>>>>>> origin/master
 *
 * Do not edit the class manually.
 *
--- a/samples/client/petstore/javascript-promise/src/api/AnotherFakeApi.js
+++ b/samples/client/petstore/javascript-promise/src/api/AnotherFakeApi.js
@@ -7,7 +7,11 @@
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 * https://openapi-generator.tech
 *
+<<<<<<< HEAD
 * OpenAPI Generator version: 4.1.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.0.2-SNAPSHOT
+>>>>>>> origin/master
 *
 * Do not edit the class manually.
 *
--- a/samples/client/petstore/javascript-promise/src/api/FakeApi.js
+++ b/samples/client/petstore/javascript-promise/src/api/FakeApi.js
@@ -7,7 +7,11 @@
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 * https://openapi-generator.tech
 *
+<<<<<<< HEAD
 * OpenAPI Generator version: 4.1.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.0.2-SNAPSHOT
+>>>>>>> origin/master
 *
 * Do not edit the class manually.
 *
--- a/samples/client/petstore/javascript-promise/src/api/FakeClassnameTags123Api.js
+++ b/samples/client/petstore/javascript-promise/src/api/FakeClassnameTags123Api.js
@@ -7,7 +7,11 @@
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 * https://openapi-generator.tech
 *
+<<<<<<< HEAD
 * OpenAPI Generator version: 4.1.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.0.2-SNAPSHOT
+>>>>>>> origin/master
 *
 * Do not edit the class manually.
 *
--- a/samples/client/petstore/javascript-promise/src/api/PetApi.js
+++ b/samples/client/petstore/javascript-promise/src/api/PetApi.js
@@ -7,7 +7,11 @@
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 * https://openapi-generator.tech
 *
+<<<<<<< HEAD
 * OpenAPI Generator version: 4.1.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.0.2-SNAPSHOT
+>>>>>>> origin/master
 *
 * Do not edit the class manually.
 *
--- a/samples/client/petstore/javascript-promise/src/api/StoreApi.js
+++ b/samples/client/petstore/javascript-promise/src/api/StoreApi.js
@@ -7,7 +7,11 @@
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 * https://openapi-generator.tech
 *
+<<<<<<< HEAD
 * OpenAPI Generator version: 4.1.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.0.2-SNAPSHOT
+>>>>>>> origin/master
 *
 * Do not edit the class manually.
 *
--- a/samples/client/petstore/javascript-promise/src/api/UserApi.js
+++ b/samples/client/petstore/javascript-promise/src/api/UserApi.js
@@ -7,7 +7,11 @@
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 * https://openapi-generator.tech
 *
+<<<<<<< HEAD
 * OpenAPI Generator version: 4.1.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.0.2-SNAPSHOT
+>>>>>>> origin/master
 *
 * Do not edit the class manually.
 *
--- a/samples/client/petstore/javascript-promise/src/index.js
+++ b/samples/client/petstore/javascript-promise/src/index.js
@@ -7,7 +7,11 @@
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 * https://openapi-generator.tech
 *
+<<<<<<< HEAD
 * OpenAPI Generator version: 4.1.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.0.2-SNAPSHOT
+>>>>>>> origin/master
 *
 * Do not edit the class manually.
 *
--- a/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesAnyType.js
+++ b/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesAnyType.js
@@ -7,7 +7,11 @@
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 * https://openapi-generator.tech
 *
+<<<<<<< HEAD
 * OpenAPI Generator version: 4.1.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.0.2-SNAPSHOT
+>>>>>>> origin/master
 *
 * Do not edit the class manually.
 *
--- a/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesArray.js
+++ b/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesArray.js
@@ -7,7 +7,11 @@
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 * https://openapi-generator.tech
 *
+<<<<<<< HEAD
 * OpenAPI Generator version: 4.1.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.0.2-SNAPSHOT
+>>>>>>> origin/master
 *
 * Do not edit the class manually.
 *
--- a/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesBoolean.js
+++ b/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesBoolean.js
@@ -7,7 +7,11 @@
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 * https://openapi-generator.tech
 *
+<<<<<<< HEAD
 * OpenAPI Generator version: 4.1.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.0.2-SNAPSHOT
+>>>>>>> origin/master
 *
 * Do not edit the class manually.
 *
--- a/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesClass.js
+++ b/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesClass.js
@@ -7,7 +7,11 @@
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 * https://openapi-generator.tech
 *
+<<<<<<< HEAD
 * OpenAPI Generator version: 4.1.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.0.2-SNAPSHOT
+>>>>>>> origin/master
 *
 * Do not edit the class manually.
 *
--- a/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesInteger.js
+++ b/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesInteger.js
@@ -7,7 +7,11 @@
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 * https://openapi-generator.tech
 *
+<<<<<<< HEAD
 * OpenAPI Generator version: 4.1.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.0.2-SNAPSHOT
+>>>>>>> origin/master
 *
 * Do not edit the class manually.
 *
--- a/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesNumber.js
+++ b/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesNumber.js
@@ -7,7 +7,11 @@
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 * https://openapi-generator.tech
 *
+<<<<<<< HEAD
 * OpenAPI Generator version: 4.1.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.0.2-SNAPSHOT
+>>>>>>> origin/master
 *
 * Do not edit the class manually.
 *
--- a/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesObject.js
+++ b/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesObject.js
@@ -7,7 +7,11 @@
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 * https://openapi-generator.tech
 *
+<<<<<<< HEAD
 * OpenAPI Generator version: 4.1.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.0.2-SNAPSHOT
+>>>>>>> origin/master
 *
 * Do not edit the class manually.
 *
--- a/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesString.js
+++ b/samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesString.js
@@ -7,7 +7,11 @@
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 * https://openapi-generator.tech
 *
+<<<<<<< HEAD
 * OpenAPI Generator version: 4.1.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.0.2-SNAPSHOT
+>>>>>>> origin/master
 *
 * Do not edit the class manually.
 *
--- a/samples/client/petstore/javascript-promise/src/model/Animal.js
+++ b/samples/client/petstore/javascript-promise/src/model/Animal.js
@@ -7,7 +7,11 @@
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 * https://openapi-generator.tech
 *
+<<<<<<< HEAD
 * OpenAPI Generator version: 4.1.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.0.2-SNAPSHOT
+>>>>>>> origin/master
 *
 * Do not edit the class manually.
 *
--- a/samples/client/petstore/javascript-promise/src/model/ApiResponse.js
+++ b/samples/client/petstore/javascript-promise/src/model/ApiResponse.js
@@ -7,7 +7,11 @@
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 * https://openapi-generator.tech
 *
+<<<<<<< HEAD
 * OpenAPI Generator version: 4.1.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.0.2-SNAPSHOT
+>>>>>>> origin/master
 *
 * Do not edit the class manually.
 *
--- a/samples/client/petstore/javascript-promise/src/model/ArrayOfArrayOfNumberOnly.js
+++ b/samples/client/petstore/javascript-promise/src/model/ArrayOfArrayOfNumberOnly.js
@@ -7,7 +7,11 @@
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 * https://openapi-generator.tech
 *
+<<<<<<< HEAD
 * OpenAPI Generator version: 4.1.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.0.2-SNAPSHOT
+>>>>>>> origin/master
 *
 * Do not edit the class manually.
 *
--- a/samples/client/petstore/javascript-promise/src/model/ArrayOfNumberOnly.js
+++ b/samples/client/petstore/javascript-promise/src/model/ArrayOfNumberOnly.js
@@ -7,7 +7,11 @@
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 * https://openapi-generator.tech
 *
+<<<<<<< HEAD
 * OpenAPI Generator version: 4.1.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.0.2-SNAPSHOT
+>>>>>>> origin/master
 *
 * Do not edit the class manually.
 *
--- a/samples/client/petstore/javascript-promise/src/model/ArrayTest.js
+++ b/samples/client/petstore/javascript-promise/src/model/ArrayTest.js
@@ -7,7 +7,11 @@
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 * https://openapi-generator.tech
 *
+<<<<<<< HEAD
 * OpenAPI Generator version: 4.1.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.0.2-SNAPSHOT
+>>>>>>> origin/master
 *
 * Do not edit the class manually.
 *
--- a/samples/client/petstore/javascript-promise/src/model/Capitalization.js
+++ b/samples/client/petstore/javascript-promise/src/model/Capitalization.js
@@ -7,7 +7,11 @@
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 * https://openapi-generator.tech
 *
+<<<<<<< HEAD
 * OpenAPI Generator version: 4.1.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.0.2-SNAPSHOT
+>>>>>>> origin/master
 *
 * Do not edit the class manually.
 *
--- a/samples/client/petstore/javascript-promise/src/model/Cat.js
+++ b/samples/client/petstore/javascript-promise/src/model/Cat.js
@@ -7,7 +7,11 @@
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 * https://openapi-generator.tech
 *
+<<<<<<< HEAD
 * OpenAPI Generator version: 4.1.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.0.2-SNAPSHOT
+>>>>>>> origin/master
 *
 * Do not edit the class manually.
 *
--- a/samples/client/petstore/javascript-promise/src/model/CatAllOf.js
+++ b/samples/client/petstore/javascript-promise/src/model/CatAllOf.js
@@ -7,7 +7,11 @@
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 * https://openapi-generator.tech
 *
+<<<<<<< HEAD
 * OpenAPI Generator version: 4.1.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.0.2-SNAPSHOT
+>>>>>>> origin/master
 *
 * Do not edit the class manually.
 *
--- a/samples/client/petstore/javascript-promise/src/model/Category.js
+++ b/samples/client/petstore/javascript-promise/src/model/Category.js
@@ -7,7 +7,11 @@
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 * https://openapi-generator.tech
 *
+<<<<<<< HEAD
 * OpenAPI Generator version: 4.1.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.0.2-SNAPSHOT
+>>>>>>> origin/master
 *
 * Do not edit the class manually.
 *
--- a/samples/client/petstore/javascript-promise/src/model/ClassModel.js
+++ b/samples/client/petstore/javascript-promise/src/model/ClassModel.js
@@ -7,7 +7,11 @@
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 * https://openapi-generator.tech
 *
+<<<<<<< HEAD
 * OpenAPI Generator version: 4.1.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.0.2-SNAPSHOT
+>>>>>>> origin/master
 *
 * Do not edit the class manually.
 *
--- a/samples/client/petstore/javascript-promise/src/model/Client.js
+++ b/samples/client/petstore/javascript-promise/src/model/Client.js
@@ -7,7 +7,11 @@
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 * https://openapi-generator.tech
 *
+<<<<<<< HEAD
 * OpenAPI Generator version: 4.1.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.0.2-SNAPSHOT
+>>>>>>> origin/master
 *
 * Do not edit the class manually.
 *
--- a/samples/client/petstore/javascript-promise/src/model/Dog.js
+++ b/samples/client/petstore/javascript-promise/src/model/Dog.js
@@ -7,7 +7,11 @@
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 * https://openapi-generator.tech
 *
+<<<<<<< HEAD
 * OpenAPI Generator version: 4.1.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.0.2-SNAPSHOT
+>>>>>>> origin/master
 *
 * Do not edit the class manually.
 *
--- a/samples/client/petstore/javascript-promise/src/model/DogAllOf.js
+++ b/samples/client/petstore/javascript-promise/src/model/DogAllOf.js
@@ -7,7 +7,11 @@
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 * https://openapi-generator.tech
 *
+<<<<<<< HEAD
 * OpenAPI Generator version: 4.1.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.0.2-SNAPSHOT
+>>>>>>> origin/master
 *
 * Do not edit the class manually.
 *
--- a/samples/client/petstore/javascript-promise/src/model/EnumArrays.js
+++ b/samples/client/petstore/javascript-promise/src/model/EnumArrays.js
@@ -7,7 +7,11 @@
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 * https://openapi-generator.tech
 *
+<<<<<<< HEAD
 * OpenAPI Generator version: 4.1.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.0.2-SNAPSHOT
+>>>>>>> origin/master
 *
 * Do not edit the class manually.
 *
--- a/samples/client/petstore/javascript-promise/src/model/EnumClass.js
+++ b/samples/client/petstore/javascript-promise/src/model/EnumClass.js
@@ -7,7 +7,11 @@
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 * https://openapi-generator.tech
 *
+<<<<<<< HEAD
 * OpenAPI Generator version: 4.1.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.0.2-SNAPSHOT
+>>>>>>> origin/master
 *
 * Do not edit the class manually.
 *
--- a/samples/client/petstore/javascript-promise/src/model/EnumTest.js
+++ b/samples/client/petstore/javascript-promise/src/model/EnumTest.js
@@ -7,7 +7,11 @@
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 * https://openapi-generator.tech
 *
+<<<<<<< HEAD
 * OpenAPI Generator version: 4.1.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.0.2-SNAPSHOT
+>>>>>>> origin/master
 *
 * Do not edit the class manually.
 *
--- a/samples/client/petstore/javascript-promise/src/model/File.js
+++ b/samples/client/petstore/javascript-promise/src/model/File.js
@@ -7,7 +7,11 @@
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 * https://openapi-generator.tech
 *
+<<<<<<< HEAD
 * OpenAPI Generator version: 4.1.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.0.2-SNAPSHOT
+>>>>>>> origin/master
 *
 * Do not edit the class manually.
 *
--- a/samples/client/petstore/javascript-promise/src/model/FileSchemaTestClass.js
+++ b/samples/client/petstore/javascript-promise/src/model/FileSchemaTestClass.js
@@ -7,7 +7,11 @@
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 * https://openapi-generator.tech
 *
+<<<<<<< HEAD
 * OpenAPI Generator version: 4.1.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.0.2-SNAPSHOT
+>>>>>>> origin/master
 *
 * Do not edit the class manually.
 *
--- a/samples/client/petstore/javascript-promise/src/model/FormatTest.js
+++ b/samples/client/petstore/javascript-promise/src/model/FormatTest.js
@@ -7,7 +7,11 @@
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 * https://openapi-generator.tech
 *
+<<<<<<< HEAD
 * OpenAPI Generator version: 4.1.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.0.2-SNAPSHOT
+>>>>>>> origin/master
 *
 * Do not edit the class manually.
 *
--- a/samples/client/petstore/javascript-promise/src/model/HasOnlyReadOnly.js
+++ b/samples/client/petstore/javascript-promise/src/model/HasOnlyReadOnly.js
@@ -7,7 +7,11 @@
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 * https://openapi-generator.tech
 *
+<<<<<<< HEAD
 * OpenAPI Generator version: 4.1.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.0.2-SNAPSHOT
+>>>>>>> origin/master
 *
 * Do not edit the class manually.
 *
--- a/samples/client/petstore/javascript-promise/src/model/List.js
+++ b/samples/client/petstore/javascript-promise/src/model/List.js
@@ -7,7 +7,11 @@
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 * https://openapi-generator.tech
 *
+<<<<<<< HEAD
 * OpenAPI Generator version: 4.1.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.0.2-SNAPSHOT
+>>>>>>> origin/master
 *
 * Do not edit the class manually.
 *
--- a/samples/client/petstore/javascript-promise/src/model/MapTest.js
+++ b/samples/client/petstore/javascript-promise/src/model/MapTest.js
@@ -7,7 +7,11 @@
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 * https://openapi-generator.tech
 *
+<<<<<<< HEAD
 * OpenAPI Generator version: 4.1.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.0.2-SNAPSHOT
+>>>>>>> origin/master
 *
 * Do not edit the class manually.
 *
--- a/samples/client/petstore/javascript-promise/src/model/MixedPropertiesAndAdditionalPropertiesClass.js
+++ b/samples/client/petstore/javascript-promise/src/model/MixedPropertiesAndAdditionalPropertiesClass.js
@@ -7,7 +7,11 @@
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 * https://openapi-generator.tech
 *
+<<<<<<< HEAD
 * OpenAPI Generator version: 4.1.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.0.2-SNAPSHOT
+>>>>>>> origin/master
 *
 * Do not edit the class manually.
 *
--- a/samples/client/petstore/javascript-promise/src/model/Model200Response.js
+++ b/samples/client/petstore/javascript-promise/src/model/Model200Response.js
@@ -7,7 +7,11 @@
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 * https://openapi-generator.tech
 *
+<<<<<<< HEAD
 * OpenAPI Generator version: 4.1.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.0.2-SNAPSHOT
+>>>>>>> origin/master
 *
 * Do not edit the class manually.
 *
--- a/samples/client/petstore/javascript-promise/src/model/ModelReturn.js
+++ b/samples/client/petstore/javascript-promise/src/model/ModelReturn.js
@@ -7,7 +7,11 @@
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 * https://openapi-generator.tech
 *
+<<<<<<< HEAD
 * OpenAPI Generator version: 4.1.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.0.2-SNAPSHOT
+>>>>>>> origin/master
 *
 * Do not edit the class manually.
 *
--- a/samples/client/petstore/javascript-promise/src/model/Name.js
+++ b/samples/client/petstore/javascript-promise/src/model/Name.js
@@ -7,7 +7,11 @@
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 * https://openapi-generator.tech
 *
+<<<<<<< HEAD
 * OpenAPI Generator version: 4.1.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.0.2-SNAPSHOT
+>>>>>>> origin/master
 *
 * Do not edit the class manually.
 *
--- a/samples/client/petstore/javascript-promise/src/model/NumberOnly.js
+++ b/samples/client/petstore/javascript-promise/src/model/NumberOnly.js
@@ -7,7 +7,11 @@
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 * https://openapi-generator.tech
 *
+<<<<<<< HEAD
 * OpenAPI Generator version: 4.1.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.0.2-SNAPSHOT
+>>>>>>> origin/master
 *
 * Do not edit the class manually.
 *
--- a/samples/client/petstore/javascript-promise/src/model/Order.js
+++ b/samples/client/petstore/javascript-promise/src/model/Order.js
@@ -7,7 +7,11 @@
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 * https://openapi-generator.tech
 *
+<<<<<<< HEAD
 * OpenAPI Generator version: 4.1.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.0.2-SNAPSHOT
+>>>>>>> origin/master
 *
 * Do not edit the class manually.
 *
--- a/samples/client/petstore/javascript-promise/src/model/OuterComposite.js
+++ b/samples/client/petstore/javascript-promise/src/model/OuterComposite.js
@@ -7,7 +7,11 @@
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 * https://openapi-generator.tech
 *
+<<<<<<< HEAD
 * OpenAPI Generator version: 4.1.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.0.2-SNAPSHOT
+>>>>>>> origin/master
 *
 * Do not edit the class manually.
 *
--- a/samples/client/petstore/javascript-promise/src/model/OuterEnum.js
+++ b/samples/client/petstore/javascript-promise/src/model/OuterEnum.js
@@ -7,7 +7,11 @@
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 * https://openapi-generator.tech
 *
+<<<<<<< HEAD
 * OpenAPI Generator version: 4.1.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.0.2-SNAPSHOT
+>>>>>>> origin/master
 *
 * Do not edit the class manually.
 *
--- a/samples/client/petstore/javascript-promise/src/model/Pet.js
+++ b/samples/client/petstore/javascript-promise/src/model/Pet.js
@@ -7,7 +7,11 @@
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 * https://openapi-generator.tech
 *
+<<<<<<< HEAD
 * OpenAPI Generator version: 4.1.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.0.2-SNAPSHOT
+>>>>>>> origin/master
 *
 * Do not edit the class manually.
 *
--- a/samples/client/petstore/javascript-promise/src/model/ReadOnlyFirst.js
+++ b/samples/client/petstore/javascript-promise/src/model/ReadOnlyFirst.js
@@ -7,7 +7,11 @@
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 * https://openapi-generator.tech
 *
+<<<<<<< HEAD
 * OpenAPI Generator version: 4.1.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.0.2-SNAPSHOT
+>>>>>>> origin/master
 *
 * Do not edit the class manually.
 *
--- a/samples/client/petstore/javascript-promise/src/model/SpecialModelName.js
+++ b/samples/client/petstore/javascript-promise/src/model/SpecialModelName.js
@@ -7,7 +7,11 @@
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 * https://openapi-generator.tech
 *
+<<<<<<< HEAD
 * OpenAPI Generator version: 4.1.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.0.2-SNAPSHOT
+>>>>>>> origin/master
 *
 * Do not edit the class manually.
 *
--- a/samples/client/petstore/javascript-promise/src/model/Tag.js
+++ b/samples/client/petstore/javascript-promise/src/model/Tag.js
@@ -7,7 +7,11 @@
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 * https://openapi-generator.tech
 *
+<<<<<<< HEAD
 * OpenAPI Generator version: 4.1.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.0.2-SNAPSHOT
+>>>>>>> origin/master
 *
 * Do not edit the class manually.
 *
--- a/samples/client/petstore/javascript-promise/src/model/TypeHolderDefault.js
+++ b/samples/client/petstore/javascript-promise/src/model/TypeHolderDefault.js
@@ -7,7 +7,11 @@
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 * https://openapi-generator.tech
 *
+<<<<<<< HEAD
 * OpenAPI Generator version: 4.1.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.0.2-SNAPSHOT
+>>>>>>> origin/master
 *
 * Do not edit the class manually.
 *
--- a/samples/client/petstore/javascript-promise/src/model/TypeHolderExample.js
+++ b/samples/client/petstore/javascript-promise/src/model/TypeHolderExample.js
@@ -7,7 +7,11 @@
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 * https://openapi-generator.tech
 *
+<<<<<<< HEAD
 * OpenAPI Generator version: 4.1.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.0.2-SNAPSHOT
+>>>>>>> origin/master
 *
 * Do not edit the class manually.
 *
--- a/samples/client/petstore/javascript-promise/src/model/User.js
+++ b/samples/client/petstore/javascript-promise/src/model/User.js
@@ -7,7 +7,11 @@
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 * https://openapi-generator.tech
 *
+<<<<<<< HEAD
 * OpenAPI Generator version: 4.1.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.0.2-SNAPSHOT
+>>>>>>> origin/master
 *
 * Do not edit the class manually.
 *
--- a/samples/client/petstore/javascript-promise/src/model/XmlItem.js
+++ b/samples/client/petstore/javascript-promise/src/model/XmlItem.js
@@ -7,7 +7,11 @@
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 * https://openapi-generator.tech
 *
+<<<<<<< HEAD
 * OpenAPI Generator version: 4.1.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.0.2-SNAPSHOT
+>>>>>>> origin/master
 *
 * Do not edit the class manually.
 *