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

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/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesAnyType.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesAnyType.php
@@ -18,7 +18,11 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
+<<<<<<< HEAD
 * OpenAPI Generator version: 4.1.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.0.2-SNAPSHOT
+>>>>>>> origin/master
 */

 /**
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesArray.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesArray.php
@@ -18,7 +18,11 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
+<<<<<<< HEAD
 * OpenAPI Generator version: 4.1.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.0.2-SNAPSHOT
+>>>>>>> origin/master
 */

 /**
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesBoolean.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesBoolean.php
@@ -18,7 +18,11 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
+<<<<<<< HEAD
 * OpenAPI Generator version: 4.1.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.0.2-SNAPSHOT
+>>>>>>> origin/master
 */

 /**
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesClass.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesClass.php
@@ -18,7 +18,11 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
+<<<<<<< HEAD
 * OpenAPI Generator version: 4.1.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.0.2-SNAPSHOT
+>>>>>>> origin/master
 */

 /**
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesInteger.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesInteger.php
@@ -18,7 +18,11 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
+<<<<<<< HEAD
 * OpenAPI Generator version: 4.1.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.0.2-SNAPSHOT
+>>>>>>> origin/master
 */

 /**
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesNumber.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesNumber.php
@@ -18,7 +18,11 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
+<<<<<<< HEAD
 * OpenAPI Generator version: 4.1.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.0.2-SNAPSHOT
+>>>>>>> origin/master
 */

 /**
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesObject.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesObject.php
@@ -18,7 +18,11 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
+<<<<<<< HEAD
 * OpenAPI Generator version: 4.1.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.0.2-SNAPSHOT
+>>>>>>> origin/master
 */

 /**
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesString.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/AdditionalPropertiesString.php
@@ -18,7 +18,11 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
+<<<<<<< HEAD
 * OpenAPI Generator version: 4.1.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.0.2-SNAPSHOT
+>>>>>>> origin/master
 */

 /**
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Animal.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Animal.php
@@ -18,7 +18,11 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
+<<<<<<< HEAD
 * OpenAPI Generator version: 4.1.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.0.2-SNAPSHOT
+>>>>>>> origin/master
 */

 /**
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ApiResponse.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ApiResponse.php
@@ -18,7 +18,11 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
+<<<<<<< HEAD
 * OpenAPI Generator version: 4.1.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.0.2-SNAPSHOT
+>>>>>>> origin/master
 */

 /**
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfArrayOfNumberOnly.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfArrayOfNumberOnly.php
@@ -18,7 +18,11 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
+<<<<<<< HEAD
 * OpenAPI Generator version: 4.1.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.0.2-SNAPSHOT
+>>>>>>> origin/master
 */

 /**
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfNumberOnly.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayOfNumberOnly.php
@@ -18,7 +18,11 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
+<<<<<<< HEAD
 * OpenAPI Generator version: 4.1.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.0.2-SNAPSHOT
+>>>>>>> origin/master
 */

 /**
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ArrayTest.php
@@ -18,7 +18,11 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
+<<<<<<< HEAD
 * OpenAPI Generator version: 4.1.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.0.2-SNAPSHOT
+>>>>>>> origin/master
 */

 /**
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Capitalization.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Capitalization.php
@@ -18,7 +18,11 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
+<<<<<<< HEAD
 * OpenAPI Generator version: 4.1.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.0.2-SNAPSHOT
+>>>>>>> origin/master
 */

 /**
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Cat.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Cat.php
@@ -18,7 +18,11 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
+<<<<<<< HEAD
 * OpenAPI Generator version: 4.1.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.0.2-SNAPSHOT
+>>>>>>> origin/master
 */

 /**
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/CatAllOf.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/CatAllOf.php
@@ -18,7 +18,11 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
+<<<<<<< HEAD
 * OpenAPI Generator version: 4.1.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.0.2-SNAPSHOT
+>>>>>>> origin/master
 */

 /**
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Category.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Category.php
@@ -18,7 +18,11 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
+<<<<<<< HEAD
 * OpenAPI Generator version: 4.1.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.0.2-SNAPSHOT
+>>>>>>> origin/master
 */

 /**
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ClassModel.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ClassModel.php
@@ -18,7 +18,11 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
+<<<<<<< HEAD
 * OpenAPI Generator version: 4.1.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.0.2-SNAPSHOT
+>>>>>>> origin/master
 */

 /**
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Client.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Client.php
@@ -18,7 +18,11 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
+<<<<<<< HEAD
 * OpenAPI Generator version: 4.1.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.0.2-SNAPSHOT
+>>>>>>> origin/master
 */

 /**
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Dog.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Dog.php
@@ -18,7 +18,11 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
+<<<<<<< HEAD
 * OpenAPI Generator version: 4.1.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.0.2-SNAPSHOT
+>>>>>>> origin/master
 */

 /**
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/DogAllOf.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/DogAllOf.php
@@ -18,7 +18,11 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
+<<<<<<< HEAD
 * OpenAPI Generator version: 4.1.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.0.2-SNAPSHOT
+>>>>>>> origin/master
 */

 /**
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumArrays.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumArrays.php
@@ -18,7 +18,11 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
+<<<<<<< HEAD
 * OpenAPI Generator version: 4.1.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.0.2-SNAPSHOT
+>>>>>>> origin/master
 */

 /**
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumClass.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumClass.php
@@ -18,7 +18,11 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
+<<<<<<< HEAD
 * OpenAPI Generator version: 4.1.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.0.2-SNAPSHOT
+>>>>>>> origin/master
 */

 /**
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/EnumTest.php
@@ -18,7 +18,11 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
+<<<<<<< HEAD
 * OpenAPI Generator version: 4.1.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.0.2-SNAPSHOT
+>>>>>>> origin/master
 */

 /**
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/File.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/File.php
@@ -18,7 +18,11 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
+<<<<<<< HEAD
 * OpenAPI Generator version: 4.1.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.0.2-SNAPSHOT
+>>>>>>> origin/master
 */

 /**
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/FileSchemaTestClass.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/FileSchemaTestClass.php
@@ -18,7 +18,11 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
+<<<<<<< HEAD
 * OpenAPI Generator version: 4.1.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.0.2-SNAPSHOT
+>>>>>>> origin/master
 */

 /**
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/FormatTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/FormatTest.php
@@ -18,7 +18,11 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
+<<<<<<< HEAD
 * OpenAPI Generator version: 4.1.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.0.2-SNAPSHOT
+>>>>>>> origin/master
 */

 /**
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/HasOnlyReadOnly.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/HasOnlyReadOnly.php
@@ -18,7 +18,11 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
+<<<<<<< HEAD
 * OpenAPI Generator version: 4.1.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.0.2-SNAPSHOT
+>>>>>>> origin/master
 */

 /**
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/MapTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/MapTest.php
@@ -18,7 +18,11 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
+<<<<<<< HEAD
 * OpenAPI Generator version: 4.1.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.0.2-SNAPSHOT
+>>>>>>> origin/master
 */

 /**
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/MixedPropertiesAndAdditionalPropertiesClass.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/MixedPropertiesAndAdditionalPropertiesClass.php
@@ -18,7 +18,11 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
+<<<<<<< HEAD
 * OpenAPI Generator version: 4.1.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.0.2-SNAPSHOT
+>>>>>>> origin/master
 */

 /**
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Model200Response.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Model200Response.php
@@ -18,7 +18,11 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
+<<<<<<< HEAD
 * OpenAPI Generator version: 4.1.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.0.2-SNAPSHOT
+>>>>>>> origin/master
 */

 /**
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelInterface.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelInterface.php
@@ -18,7 +18,11 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
+<<<<<<< HEAD
 * OpenAPI Generator version: 4.1.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.0.2-SNAPSHOT
+>>>>>>> origin/master
 */

 /**
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelList.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelList.php
@@ -18,7 +18,11 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
+<<<<<<< HEAD
 * OpenAPI Generator version: 4.1.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.0.2-SNAPSHOT
+>>>>>>> origin/master
 */

 /**
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelReturn.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ModelReturn.php
@@ -18,7 +18,11 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
+<<<<<<< HEAD
 * OpenAPI Generator version: 4.1.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.0.2-SNAPSHOT
+>>>>>>> origin/master
 */

 /**
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Name.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Name.php
@@ -18,7 +18,11 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
+<<<<<<< HEAD
 * OpenAPI Generator version: 4.1.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.0.2-SNAPSHOT
+>>>>>>> origin/master
 */

 /**
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/NumberOnly.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/NumberOnly.php
@@ -18,7 +18,11 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
+<<<<<<< HEAD
 * OpenAPI Generator version: 4.1.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.0.2-SNAPSHOT
+>>>>>>> origin/master
 */

 /**
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Order.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Order.php
@@ -18,7 +18,11 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
+<<<<<<< HEAD
 * OpenAPI Generator version: 4.1.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.0.2-SNAPSHOT
+>>>>>>> origin/master
 */

 /**
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterComposite.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterComposite.php
@@ -18,7 +18,11 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
+<<<<<<< HEAD
 * OpenAPI Generator version: 4.1.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.0.2-SNAPSHOT
+>>>>>>> origin/master
 */

 /**
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnum.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterEnum.php
@@ -18,7 +18,11 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
+<<<<<<< HEAD
 * OpenAPI Generator version: 4.1.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.0.2-SNAPSHOT
+>>>>>>> origin/master
 */

 /**
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Pet.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Pet.php
@@ -18,7 +18,11 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
+<<<<<<< HEAD
 * OpenAPI Generator version: 4.1.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.0.2-SNAPSHOT
+>>>>>>> origin/master
 */

 /**
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ReadOnlyFirst.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/ReadOnlyFirst.php
@@ -18,7 +18,11 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
+<<<<<<< HEAD
 * OpenAPI Generator version: 4.1.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.0.2-SNAPSHOT
+>>>>>>> origin/master
 */

 /**
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/SpecialModelName.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/SpecialModelName.php
@@ -18,7 +18,11 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
+<<<<<<< HEAD
 * OpenAPI Generator version: 4.1.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.0.2-SNAPSHOT
+>>>>>>> origin/master
 */

 /**
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Tag.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/Tag.php
@@ -18,7 +18,11 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
+<<<<<<< HEAD
 * OpenAPI Generator version: 4.1.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.0.2-SNAPSHOT
+>>>>>>> origin/master
 */

 /**
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/TypeHolderDefault.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/TypeHolderDefault.php
@@ -18,7 +18,11 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
+<<<<<<< HEAD
 * OpenAPI Generator version: 4.1.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.0.2-SNAPSHOT
+>>>>>>> origin/master
 */

 /**
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/TypeHolderExample.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/TypeHolderExample.php
@@ -18,7 +18,11 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
+<<<<<<< HEAD
 * OpenAPI Generator version: 4.1.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.0.2-SNAPSHOT
+>>>>>>> origin/master
 */

 /**
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/User.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/User.php
@@ -18,7 +18,11 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
+<<<<<<< HEAD
 * OpenAPI Generator version: 4.1.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.0.2-SNAPSHOT
+>>>>>>> origin/master
 */

 /**
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/XmlItem.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/XmlItem.php
@@ -18,7 +18,11 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
+<<<<<<< HEAD
 * OpenAPI Generator version: 4.1.0-SNAPSHOT
+=======
+ * OpenAPI Generator version: 4.0.2-SNAPSHOT
+>>>>>>> origin/master
 */

 /**