update samples without batch mode

2019-11-21 17:13:30 +08:00
parent be991311fe
commit ac8b96b972
238 changed files with 21 additions and 1645 deletions
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesAnyTypeTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesAnyTypeTest.php
@@ -18,11 +18,7 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
 */

 /**
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesArrayTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesArrayTest.php
@@ -18,11 +18,7 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
 */

 /**
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesBooleanTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesBooleanTest.php
@@ -18,11 +18,7 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
 */

 /**
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesClassTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesClassTest.php
@@ -18,11 +18,7 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
 */

 /**
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesIntegerTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesIntegerTest.php
@@ -18,11 +18,7 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
 */

 /**
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesNumberTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesNumberTest.php
@@ -18,11 +18,7 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
 */

 /**
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesObjectTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesObjectTest.php
@@ -18,11 +18,7 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
 */

 /**
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesStringTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesStringTest.php
@@ -18,11 +18,7 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
 */

 /**
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/AnimalTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/AnimalTest.php
@@ -18,11 +18,7 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
 */

 /**
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ApiResponseTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ApiResponseTest.php
@@ -18,11 +18,7 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
 */

 /**
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ArrayOfArrayOfNumberOnlyTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ArrayOfArrayOfNumberOnlyTest.php
@@ -18,11 +18,7 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
 */

 /**
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ArrayOfNumberOnlyTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ArrayOfNumberOnlyTest.php
@@ -18,11 +18,7 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
 */

 /**
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ArrayTestTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ArrayTestTest.php
@@ -18,11 +18,7 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
 */

 /**
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/CapitalizationTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/CapitalizationTest.php
@@ -18,11 +18,7 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
 */

 /**
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/CatAllOfTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/CatAllOfTest.php
@@ -18,11 +18,7 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
 */

 /**
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/CatTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/CatTest.php
@@ -18,11 +18,7 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
 */

 /**
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/CategoryTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/CategoryTest.php
@@ -18,11 +18,7 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
 */

 /**
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ClassModelTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ClassModelTest.php
@@ -18,11 +18,7 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
 */

 /**
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ClientTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ClientTest.php
@@ -18,11 +18,7 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
 */

 /**
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/DogAllOfTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/DogAllOfTest.php
@@ -18,11 +18,7 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
 */

 /**
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/DogTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/DogTest.php
@@ -18,11 +18,7 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
 */

 /**
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/EnumArraysTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/EnumArraysTest.php
@@ -18,11 +18,7 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
 */

 /**
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/EnumClassTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/EnumClassTest.php
@@ -18,11 +18,7 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
 */

 /**
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/EnumTestTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/EnumTestTest.php
@@ -18,11 +18,7 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
 */

 /**
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/FileSchemaTestClassTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/FileSchemaTestClassTest.php
@@ -18,11 +18,7 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
 */

 /**
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/FileTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/FileTest.php
@@ -18,11 +18,7 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
 */

 /**
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/FormatTestTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/FormatTestTest.php
@@ -18,11 +18,7 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
 */

 /**
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/HasOnlyReadOnlyTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/HasOnlyReadOnlyTest.php
@@ -18,11 +18,7 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
 */

 /**
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/MapTestTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/MapTestTest.php
@@ -18,11 +18,7 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
 */

 /**
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/MixedPropertiesAndAdditionalPropertiesClassTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/MixedPropertiesAndAdditionalPropertiesClassTest.php
@@ -18,11 +18,7 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
 */

 /**
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/Model200ResponseTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/Model200ResponseTest.php
@@ -18,11 +18,7 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
 */

 /**
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ModelListTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ModelListTest.php
@@ -18,11 +18,7 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
 */

 /**
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ModelReturnTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ModelReturnTest.php
@@ -18,11 +18,7 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
 */

 /**
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/NameTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/NameTest.php
@@ -18,11 +18,7 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
 */

 /**
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/NumberOnlyTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/NumberOnlyTest.php
@@ -18,11 +18,7 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
 */

 /**
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/OrderTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/OrderTest.php
@@ -18,11 +18,7 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
 */

 /**
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/OuterCompositeTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/OuterCompositeTest.php
@@ -18,11 +18,7 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
 */

 /**
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumTest.php
@@ -18,11 +18,7 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
 */

 /**
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/PetTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/PetTest.php
@@ -18,11 +18,7 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
 */

 /**
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ReadOnlyFirstTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ReadOnlyFirstTest.php
@@ -18,11 +18,7 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
 */

 /**
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/SpecialModelNameTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/SpecialModelNameTest.php
@@ -18,11 +18,7 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
 */

 /**
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/TagTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/TagTest.php
@@ -18,11 +18,7 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
 */

 /**
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/TypeHolderDefaultTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/TypeHolderDefaultTest.php
@@ -18,11 +18,7 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
 */

 /**
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/TypeHolderExampleTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/TypeHolderExampleTest.php
@@ -18,11 +18,7 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
 */

 /**
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/UserTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/UserTest.php
@@ -18,11 +18,7 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
 */

 /**
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/XmlItemTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/XmlItemTest.php
@@ -18,11 +18,7 @@
 * The version of the OpenAPI document: 1.0.0
 * 
 * Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 * OpenAPI Generator version: 5.0.0-SNAPSHOT
-=======
- * OpenAPI Generator version: 4.3.0-SNAPSHOT
->>>>>>> 4.3.x
 */

 /**