sync master

modules/openapi-generator-cli/pom.xml

@@ -3,11 +3,7 @@
     <parent>
         <groupId>org.openapitools</groupId>
         <artifactId>openapi-generator-project</artifactId>
-<<<<<<< HEAD
         <version>4.1.0-SNAPSHOT</version>
-=======
-        <version>4.0.2-SNAPSHOT</version>
->>>>>>> origin/master
         <relativePath>../..</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/openapi-generator-core/pom.xml

@@ -5,11 +5,7 @@
   <parent>
     <artifactId>openapi-generator-project</artifactId>
     <groupId>org.openapitools</groupId>
-<<<<<<< HEAD
     <version>4.1.0-SNAPSHOT</version>
-=======
-    <version>4.0.2-SNAPSHOT</version>
->>>>>>> origin/master
     <relativePath>../..</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>

modules/openapi-generator-gradle-plugin/gradle.properties

@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 openApiGeneratorVersion=4.1.0-SNAPSHOT
-=======
-openApiGeneratorVersion=4.0.2-SNAPSHOT
->>>>>>> origin/master
 
 # BEGIN placeholders
 # these are just placeholders to allow contributors to build directly

modules/openapi-generator-gradle-plugin/pom.xml

@@ -3,11 +3,7 @@
     <parent>
         <groupId>org.openapitools</groupId>
         <artifactId>openapi-generator-project</artifactId>
-<<<<<<< HEAD
         <version>4.1.0-SNAPSHOT</version>
-=======
-        <version>4.0.2-SNAPSHOT</version>
->>>>>>> origin/master
         <relativePath>../..</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/openapi-generator-maven-plugin/pom.xml

@@ -4,11 +4,7 @@
     <parent>
         <groupId>org.openapitools</groupId>
         <artifactId>openapi-generator-project</artifactId>
-<<<<<<< HEAD
         <version>4.1.0-SNAPSHOT</version>
-=======
-        <version>4.0.2-SNAPSHOT</version>
->>>>>>> origin/master
         <relativePath>../..</relativePath>
     </parent>
     <artifactId>openapi-generator-maven-plugin</artifactId>

modules/openapi-generator-online/pom.xml

@@ -3,11 +3,7 @@
     <parent>
         <groupId>org.openapitools</groupId>
         <artifactId>openapi-generator-project</artifactId>
-<<<<<<< HEAD
         <version>4.1.0-SNAPSHOT</version>
-=======
-        <version>4.0.2-SNAPSHOT</version>
->>>>>>> origin/master
         <relativePath>../..</relativePath>
     </parent>
     <artifactId>openapi-generator-online</artifactId>

modules/openapi-generator/pom.xml

@@ -3,11 +3,7 @@
     <parent>
         <groupId>org.openapitools</groupId>
         <artifactId>openapi-generator-project</artifactId>
-<<<<<<< HEAD
         <version>4.1.0-SNAPSHOT</version>
-=======
-        <version>4.0.2-SNAPSHOT</version>
->>>>>>> origin/master
         <relativePath>../..</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -317,11 +313,7 @@
         <dependency>
             <groupId>org.openapitools</groupId>
             <artifactId>openapi-generator-core</artifactId>
-<<<<<<< HEAD
             <version>4.1.0-SNAPSHOT</version>
-=======
-            <version>4.0.2-SNAPSHOT</version>
->>>>>>> origin/master
         </dependency>
     </dependencies>
     <repositories>

pom.xml

@@ -9,11 +9,7 @@
     <artifactId>openapi-generator-project</artifactId>
     <packaging>pom</packaging>
     <name>openapi-generator-project</name>
-<<<<<<< HEAD
     <version>4.1.0-SNAPSHOT</version>
-=======
-    <version>4.0.2-SNAPSHOT</version>
->>>>>>> origin/master
     <url>https://github.com/openapitools/openapi-generator</url>
     <scm>
         <connection>scm:git:git@github.com:openapitools/openapi-generator.git</connection>

samples/client/petstore/R/.openapi-generator/VERSION

@@ -1,5 +1 @@
-<<<<<<< HEAD
+4.1.0-SNAPSHOT
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master

samples/client/petstore/apex/.openapi-generator/VERSION

@@ -1 +1 @@
-4.0.2-SNAPSHOT
+4.1.0-SNAPSHOT

samples/client/petstore/csharp-netcore/OpenAPIClient/.openapi-generator/VERSION

@@ -1,5 +1 @@
-<<<<<<< HEAD
+4.1.0-SNAPSHOT
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master

samples/client/petstore/csharp-netcore/OpenAPIClientCore/.openapi-generator/VERSION

@@ -1 +1 @@
-4.0.2-SNAPSHOT
+4.1.0-SNAPSHOT

samples/client/petstore/csharp/OpenAPIClient/.openapi-generator/VERSION

@@ -1,5 +1 @@
-<<<<<<< HEAD
+4.1.0-SNAPSHOT
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master

samples/client/petstore/elixir/.openapi-generator/VERSION

@@ -1,5 +1 @@
-<<<<<<< HEAD
+4.1.0-SNAPSHOT
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master

samples/client/petstore/go/go-petstore/.openapi-generator/VERSION

@@ -1,5 +1 @@
-<<<<<<< HEAD
+4.1.0-SNAPSHOT
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master

samples/client/petstore/groovy/.openapi-generator/VERSION

@@ -1,5 +1 @@
-<<<<<<< HEAD
+4.1.0-SNAPSHOT
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master

samples/client/petstore/haskell-http-client/.openapi-generator/VERSION

@@ -1,5 +1 @@
-<<<<<<< HEAD
+4.1.0-SNAPSHOT
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master

samples/client/petstore/java/feign/.openapi-generator/VERSION

@@ -1,5 +1 @@
-<<<<<<< HEAD
+4.1.0-SNAPSHOT
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master

samples/client/petstore/java/feign10x/.openapi-generator/VERSION

@@ -1,5 +1 @@
-<<<<<<< HEAD
+4.1.0-SNAPSHOT
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master

samples/client/petstore/java/google-api-client/.openapi-generator/VERSION

@@ -1,5 +1 @@
-<<<<<<< HEAD
+4.1.0-SNAPSHOT
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master

samples/client/petstore/java/jersey1/.openapi-generator/VERSION

@@ -1,5 +1 @@
-<<<<<<< HEAD
+4.1.0-SNAPSHOT
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master

samples/client/petstore/java/jersey2-java6/.openapi-generator/VERSION

@@ -1,5 +1 @@
-<<<<<<< HEAD
+4.1.0-SNAPSHOT
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master

samples/client/petstore/java/jersey2-java8/.openapi-generator/VERSION

@@ -1,5 +1 @@
-<<<<<<< HEAD
+4.1.0-SNAPSHOT
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master

samples/client/petstore/java/jersey2/.openapi-generator/VERSION

@@ -1,5 +1 @@
-<<<<<<< HEAD
+4.1.0-SNAPSHOT
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master

samples/client/petstore/java/okhttp-gson-parcelableModel/.openapi-generator/VERSION

@@ -1,5 +1 @@
-<<<<<<< HEAD
+4.1.0-SNAPSHOT
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master

samples/client/petstore/java/okhttp-gson/.openapi-generator/VERSION

@@ -1,5 +1 @@
-<<<<<<< HEAD
+4.1.0-SNAPSHOT
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master

samples/client/petstore/java/rest-assured/.openapi-generator/VERSION

@@ -1,5 +1 @@
-<<<<<<< HEAD
+4.1.0-SNAPSHOT
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master

samples/client/petstore/java/resteasy/.openapi-generator/VERSION

@@ -1,5 +1 @@
-<<<<<<< HEAD
+4.1.0-SNAPSHOT
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master

samples/client/petstore/java/resttemplate-withXml/.openapi-generator/VERSION

@@ -1,5 +1 @@
-<<<<<<< HEAD
+4.1.0-SNAPSHOT
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master

samples/client/petstore/java/resttemplate/.openapi-generator/VERSION

@@ -1,5 +1 @@
-<<<<<<< HEAD
+4.1.0-SNAPSHOT
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master

samples/client/petstore/java/retrofit/.openapi-generator/VERSION

@@ -1,5 +1 @@
-<<<<<<< HEAD
+4.1.0-SNAPSHOT
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master

samples/client/petstore/java/retrofit2-play24/.openapi-generator/VERSION

@@ -1,5 +1 @@
-<<<<<<< HEAD
+4.1.0-SNAPSHOT
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master

samples/client/petstore/java/retrofit2-play25/.openapi-generator/VERSION

@@ -1,5 +1 @@
-<<<<<<< HEAD
+4.1.0-SNAPSHOT
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master

samples/client/petstore/java/retrofit2-play26/.openapi-generator/VERSION

@@ -1,5 +1 @@
-<<<<<<< HEAD
+4.1.0-SNAPSHOT
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master

samples/client/petstore/java/retrofit2/.openapi-generator/VERSION

@@ -1,5 +1 @@
-<<<<<<< HEAD
+4.1.0-SNAPSHOT
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master

samples/client/petstore/java/retrofit2rx/.openapi-generator/VERSION

@@ -1,5 +1 @@
-<<<<<<< HEAD
+4.1.0-SNAPSHOT
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master

samples/client/petstore/java/retrofit2rx2/.openapi-generator/VERSION

@@ -1,5 +1 @@
-<<<<<<< HEAD
+4.1.0-SNAPSHOT
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master

samples/client/petstore/java/vertx/.openapi-generator/VERSION

@@ -1,5 +1 @@
-<<<<<<< HEAD
+4.1.0-SNAPSHOT
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master

samples/client/petstore/java/webclient/.openapi-generator/VERSION

@@ -1,5 +1 @@
-<<<<<<< HEAD
+4.1.0-SNAPSHOT
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master

samples/client/petstore/javascript-es6/.openapi-generator/VERSION

@@ -1,5 +1 @@
-<<<<<<< HEAD
+4.1.0-SNAPSHOT
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master

samples/client/petstore/javascript-promise-es6/.openapi-generator/VERSION

@@ -1,5 +1 @@
-<<<<<<< HEAD
+4.1.0-SNAPSHOT
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master

samples/client/petstore/javascript-promise/.openapi-generator/VERSION

@@ -1,5 +1 @@
-<<<<<<< HEAD
+4.1.0-SNAPSHOT
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master

samples/client/petstore/javascript-promise/src/ApiClient.js

@@ -7,11 +7,7 @@
  * 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.
  *

samples/client/petstore/javascript-promise/src/api/AnotherFakeApi.js

@@ -7,11 +7,7 @@
  * 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.
  *

samples/client/petstore/javascript-promise/src/api/FakeApi.js

@@ -7,11 +7,7 @@
  * 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.
  *

samples/client/petstore/javascript-promise/src/api/FakeClassnameTags123Api.js

@@ -7,11 +7,7 @@
  * 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.
  *

samples/client/petstore/javascript-promise/src/api/PetApi.js

@@ -7,11 +7,7 @@
  * 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.
  *

samples/client/petstore/javascript-promise/src/api/StoreApi.js

@@ -7,11 +7,7 @@
  * 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.
  *

samples/client/petstore/javascript-promise/src/api/UserApi.js

@@ -7,11 +7,7 @@
  * 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.
  *

samples/client/petstore/javascript-promise/src/index.js

@@ -7,11 +7,7 @@
  * 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.
  *

samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesAnyType.js

@@ -7,11 +7,7 @@
  * 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.
  *

samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesArray.js

@@ -7,11 +7,7 @@
  * 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.
  *

samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesBoolean.js

@@ -7,11 +7,7 @@
  * 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.
  *

samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesClass.js

@@ -7,11 +7,7 @@
  * 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.
  *

samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesInteger.js

@@ -7,11 +7,7 @@
  * 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.
  *

samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesNumber.js

@@ -7,11 +7,7 @@
  * 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.
  *

samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesObject.js

@@ -7,11 +7,7 @@
  * 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.
  *

samples/client/petstore/javascript-promise/src/model/AdditionalPropertiesString.js

@@ -7,11 +7,7 @@
  * 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.
  *

samples/client/petstore/javascript-promise/src/model/Animal.js

@@ -7,11 +7,7 @@
  * 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.
  *

samples/client/petstore/javascript-promise/src/model/ApiResponse.js

@@ -7,11 +7,7 @@
  * 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.
  *

samples/client/petstore/javascript-promise/src/model/ArrayOfArrayOfNumberOnly.js

@@ -7,11 +7,7 @@
  * 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.
  *

samples/client/petstore/javascript-promise/src/model/ArrayOfNumberOnly.js

@@ -7,11 +7,7 @@
  * 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.
  *

samples/client/petstore/javascript-promise/src/model/ArrayTest.js

@@ -7,11 +7,7 @@
  * 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.
  *

samples/client/petstore/javascript-promise/src/model/Capitalization.js

@@ -7,11 +7,7 @@
  * 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.
  *

samples/client/petstore/javascript-promise/src/model/Cat.js

@@ -7,11 +7,7 @@
  * 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.
  *

samples/client/petstore/javascript-promise/src/model/CatAllOf.js

@@ -7,11 +7,7 @@
  * 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.
  *

samples/client/petstore/javascript-promise/src/model/Category.js

@@ -7,11 +7,7 @@
  * 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.
  *

samples/client/petstore/javascript-promise/src/model/ClassModel.js

@@ -7,11 +7,7 @@
  * 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.
  *

samples/client/petstore/javascript-promise/src/model/Client.js

@@ -7,11 +7,7 @@
  * 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.
  *

samples/client/petstore/javascript-promise/src/model/Dog.js

@@ -7,11 +7,7 @@
  * 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.
  *

samples/client/petstore/javascript-promise/src/model/DogAllOf.js

@@ -7,11 +7,7 @@
  * 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.
  *

samples/client/petstore/javascript-promise/src/model/EnumArrays.js

@@ -7,11 +7,7 @@
  * 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.
  *

samples/client/petstore/javascript-promise/src/model/EnumClass.js

@@ -7,11 +7,7 @@
  * 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.
  *

samples/client/petstore/javascript-promise/src/model/EnumTest.js

@@ -7,11 +7,7 @@
  * 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.
  *

samples/client/petstore/javascript-promise/src/model/File.js

@@ -7,11 +7,7 @@
  * 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.
  *

samples/client/petstore/javascript-promise/src/model/FileSchemaTestClass.js

@@ -7,11 +7,7 @@
  * 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.
  *

samples/client/petstore/javascript-promise/src/model/FormatTest.js

@@ -7,11 +7,7 @@
  * 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.
  *

samples/client/petstore/javascript-promise/src/model/HasOnlyReadOnly.js

@@ -7,11 +7,7 @@
  * 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.
  *

samples/client/petstore/javascript-promise/src/model/List.js

@@ -7,11 +7,7 @@
  * 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.
  *

samples/client/petstore/javascript-promise/src/model/MapTest.js

@@ -7,11 +7,7 @@
  * 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.
  *

samples/client/petstore/javascript-promise/src/model/MixedPropertiesAndAdditionalPropertiesClass.js

@@ -7,11 +7,7 @@
  * 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.
  *

samples/client/petstore/javascript-promise/src/model/Model200Response.js

@@ -7,11 +7,7 @@
  * 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.
  *

samples/client/petstore/javascript-promise/src/model/ModelReturn.js

@@ -7,11 +7,7 @@
  * 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.
  *

samples/client/petstore/javascript-promise/src/model/Name.js

@@ -7,11 +7,7 @@
  * 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.
  *

samples/client/petstore/javascript-promise/src/model/NumberOnly.js

@@ -7,11 +7,7 @@
  * 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.
  *

samples/client/petstore/javascript-promise/src/model/Order.js

@@ -7,11 +7,7 @@
  * 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.
  *

samples/client/petstore/javascript-promise/src/model/OuterComposite.js

@@ -7,11 +7,7 @@
  * 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.
  *

samples/client/petstore/javascript-promise/src/model/OuterEnum.js

@@ -7,11 +7,7 @@
  * 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.
  *

samples/client/petstore/javascript-promise/src/model/Pet.js

@@ -7,11 +7,7 @@
  * 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.
  *

samples/client/petstore/javascript-promise/src/model/ReadOnlyFirst.js

@@ -7,11 +7,7 @@
  * 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.
  *

samples/client/petstore/javascript-promise/src/model/SpecialModelName.js

@@ -7,11 +7,7 @@
  * 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.
  *

samples/client/petstore/javascript-promise/src/model/Tag.js

@@ -7,11 +7,7 @@
  * 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.
  *

samples/client/petstore/javascript-promise/src/model/TypeHolderDefault.js

@@ -7,11 +7,7 @@
  * 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.
  *

samples/client/petstore/javascript-promise/src/model/TypeHolderExample.js

@@ -7,11 +7,7 @@
  * 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.
  *

samples/client/petstore/javascript-promise/src/model/User.js

@@ -7,11 +7,7 @@
  * 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.
  *

samples/client/petstore/javascript-promise/src/model/XmlItem.js

@@ -7,11 +7,7 @@
  * 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.
  *

samples/client/petstore/javascript/.openapi-generator/VERSION

@@ -1,5 +1 @@
-<<<<<<< HEAD
+4.1.0-SNAPSHOT
-4.1.0-SNAPSHOT
-=======
-4.0.2-SNAPSHOT
->>>>>>> origin/master

samples/client/petstore/javascript/src/ApiClient.js

@@ -7,11 +7,7 @@
  * 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.
  *

samples/client/petstore/javascript/src/api/AnotherFakeApi.js

@@ -7,11 +7,7 @@
  * 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.
  *

samples/client/petstore/javascript/src/api/FakeApi.js

@@ -7,11 +7,7 @@
  * 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.
  *