update samples

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

@@ -1,5 +1 @@
-<<<<<<< HEAD
 6.0.0-SNAPSHOT
-=======
-5.3.0-SNAPSHOT
->>>>>>> origin/5.3.x

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

@@ -1,5 +1 @@
-<<<<<<< HEAD
 6.0.0-SNAPSHOT
-=======
-5.3.0-SNAPSHOT
->>>>>>> origin/5.3.x

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

@@ -1,5 +1 @@
-<<<<<<< HEAD
 6.0.0-SNAPSHOT
-=======
-5.3.0-SNAPSHOT
->>>>>>> origin/5.3.x

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

@@ -1,5 +1 @@
-<<<<<<< HEAD
 6.0.0-SNAPSHOT
-=======
-5.3.0-SNAPSHOT
->>>>>>> origin/5.3.x

samples/client/petstore/cpp-qt/.openapi-generator/VERSION

@@ -1 +1 @@
-5.3.0-SNAPSHOT
+6.0.0-SNAPSHOT

samples/client/petstore/cpp-restsdk/client/.openapi-generator/VERSION

@@ -1,5 +1 @@
-<<<<<<< HEAD
 6.0.0-SNAPSHOT
-=======
-5.3.0-SNAPSHOT
->>>>>>> origin/5.3.x

samples/client/petstore/cpp-restsdk/client/ApiClient.cpp

@@ -4,11 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI-Generator 6.0.0-SNAPSHOT.
-=======
- * NOTE: This class is auto generated by OpenAPI-Generator 5.3.0-SNAPSHOT.
->>>>>>> origin/5.3.x
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/client/petstore/cpp-restsdk/client/ApiClient.h

@@ -4,11 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI-Generator 6.0.0-SNAPSHOT.
-=======
- * NOTE: This class is auto generated by OpenAPI-Generator 5.3.0-SNAPSHOT.
->>>>>>> origin/5.3.x
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/client/petstore/cpp-restsdk/client/ApiConfiguration.cpp

@@ -4,11 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI-Generator 6.0.0-SNAPSHOT.
-=======
- * NOTE: This class is auto generated by OpenAPI-Generator 5.3.0-SNAPSHOT.
->>>>>>> origin/5.3.x
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/client/petstore/cpp-restsdk/client/ApiConfiguration.h

@@ -4,11 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI-Generator 6.0.0-SNAPSHOT.
-=======
- * NOTE: This class is auto generated by OpenAPI-Generator 5.3.0-SNAPSHOT.
->>>>>>> origin/5.3.x
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/client/petstore/cpp-restsdk/client/ApiException.cpp

@@ -4,11 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI-Generator 6.0.0-SNAPSHOT.
-=======
- * NOTE: This class is auto generated by OpenAPI-Generator 5.3.0-SNAPSHOT.
->>>>>>> origin/5.3.x
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/client/petstore/cpp-restsdk/client/ApiException.h

@@ -4,11 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI-Generator 6.0.0-SNAPSHOT.
-=======
- * NOTE: This class is auto generated by OpenAPI-Generator 5.3.0-SNAPSHOT.
->>>>>>> origin/5.3.x
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/client/petstore/cpp-restsdk/client/HttpContent.cpp

@@ -4,11 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI-Generator 6.0.0-SNAPSHOT.
-=======
- * NOTE: This class is auto generated by OpenAPI-Generator 5.3.0-SNAPSHOT.
->>>>>>> origin/5.3.x
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/client/petstore/cpp-restsdk/client/HttpContent.h

@@ -4,11 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI-Generator 6.0.0-SNAPSHOT.
-=======
- * NOTE: This class is auto generated by OpenAPI-Generator 5.3.0-SNAPSHOT.
->>>>>>> origin/5.3.x
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/client/petstore/cpp-restsdk/client/IHttpBody.h

@@ -4,11 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI-Generator 6.0.0-SNAPSHOT.
-=======
- * NOTE: This class is auto generated by OpenAPI-Generator 5.3.0-SNAPSHOT.
->>>>>>> origin/5.3.x
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/client/petstore/cpp-restsdk/client/JsonBody.cpp

@@ -4,11 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI-Generator 6.0.0-SNAPSHOT.
-=======
- * NOTE: This class is auto generated by OpenAPI-Generator 5.3.0-SNAPSHOT.
->>>>>>> origin/5.3.x
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/client/petstore/cpp-restsdk/client/JsonBody.h

@@ -4,11 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI-Generator 6.0.0-SNAPSHOT.
-=======
- * NOTE: This class is auto generated by OpenAPI-Generator 5.3.0-SNAPSHOT.
->>>>>>> origin/5.3.x
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/client/petstore/cpp-restsdk/client/ModelBase.cpp

@@ -4,11 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI-Generator 6.0.0-SNAPSHOT.
-=======
- * NOTE: This class is auto generated by OpenAPI-Generator 5.3.0-SNAPSHOT.
->>>>>>> origin/5.3.x
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/client/petstore/cpp-restsdk/client/ModelBase.h

@@ -4,11 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI-Generator 6.0.0-SNAPSHOT.
-=======
- * NOTE: This class is auto generated by OpenAPI-Generator 5.3.0-SNAPSHOT.
->>>>>>> origin/5.3.x
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/client/petstore/cpp-restsdk/client/MultipartFormData.cpp

@@ -4,11 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI-Generator 6.0.0-SNAPSHOT.
-=======
- * NOTE: This class is auto generated by OpenAPI-Generator 5.3.0-SNAPSHOT.
->>>>>>> origin/5.3.x
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/client/petstore/cpp-restsdk/client/MultipartFormData.h

@@ -4,11 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI-Generator 6.0.0-SNAPSHOT.
-=======
- * NOTE: This class is auto generated by OpenAPI-Generator 5.3.0-SNAPSHOT.
->>>>>>> origin/5.3.x
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/client/petstore/cpp-restsdk/client/Object.cpp

@@ -4,11 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI-Generator 6.0.0-SNAPSHOT.
-=======
- * NOTE: This class is auto generated by OpenAPI-Generator 5.3.0-SNAPSHOT.
->>>>>>> origin/5.3.x
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/client/petstore/cpp-restsdk/client/Object.h

@@ -4,11 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI-Generator 6.0.0-SNAPSHOT.
-=======
- * NOTE: This class is auto generated by OpenAPI-Generator 5.3.0-SNAPSHOT.
->>>>>>> origin/5.3.x
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/client/petstore/cpp-restsdk/client/api/PetApi.cpp

@@ -4,11 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI-Generator 6.0.0-SNAPSHOT.
-=======
- * NOTE: This class is auto generated by OpenAPI-Generator 5.3.0-SNAPSHOT.
->>>>>>> origin/5.3.x
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/client/petstore/cpp-restsdk/client/api/PetApi.h

@@ -4,11 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI-Generator 6.0.0-SNAPSHOT.
-=======
- * NOTE: This class is auto generated by OpenAPI-Generator 5.3.0-SNAPSHOT.
->>>>>>> origin/5.3.x
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/client/petstore/cpp-restsdk/client/api/StoreApi.cpp

@@ -4,11 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI-Generator 6.0.0-SNAPSHOT.
-=======
- * NOTE: This class is auto generated by OpenAPI-Generator 5.3.0-SNAPSHOT.
->>>>>>> origin/5.3.x
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/client/petstore/cpp-restsdk/client/api/StoreApi.h

@@ -4,11 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI-Generator 6.0.0-SNAPSHOT.
-=======
- * NOTE: This class is auto generated by OpenAPI-Generator 5.3.0-SNAPSHOT.
->>>>>>> origin/5.3.x
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/client/petstore/cpp-restsdk/client/api/UserApi.cpp

@@ -4,11 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI-Generator 6.0.0-SNAPSHOT.
-=======
- * NOTE: This class is auto generated by OpenAPI-Generator 5.3.0-SNAPSHOT.
->>>>>>> origin/5.3.x
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/client/petstore/cpp-restsdk/client/api/UserApi.h

@@ -4,11 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI-Generator 6.0.0-SNAPSHOT.
-=======
- * NOTE: This class is auto generated by OpenAPI-Generator 5.3.0-SNAPSHOT.
->>>>>>> origin/5.3.x
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/client/petstore/cpp-restsdk/client/model/ApiResponse.cpp

@@ -4,11 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI-Generator 6.0.0-SNAPSHOT.
-=======
- * NOTE: This class is auto generated by OpenAPI-Generator 5.3.0-SNAPSHOT.
->>>>>>> origin/5.3.x
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/client/petstore/cpp-restsdk/client/model/ApiResponse.h

@@ -4,11 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI-Generator 6.0.0-SNAPSHOT.
-=======
- * NOTE: This class is auto generated by OpenAPI-Generator 5.3.0-SNAPSHOT.
->>>>>>> origin/5.3.x
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/client/petstore/cpp-restsdk/client/model/Category.cpp

@@ -4,11 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI-Generator 6.0.0-SNAPSHOT.
-=======
- * NOTE: This class is auto generated by OpenAPI-Generator 5.3.0-SNAPSHOT.
->>>>>>> origin/5.3.x
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/client/petstore/cpp-restsdk/client/model/Category.h

@@ -4,11 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI-Generator 6.0.0-SNAPSHOT.
-=======
- * NOTE: This class is auto generated by OpenAPI-Generator 5.3.0-SNAPSHOT.
->>>>>>> origin/5.3.x
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/client/petstore/cpp-restsdk/client/model/Order.cpp

@@ -4,11 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI-Generator 6.0.0-SNAPSHOT.
-=======
- * NOTE: This class is auto generated by OpenAPI-Generator 5.3.0-SNAPSHOT.
->>>>>>> origin/5.3.x
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/client/petstore/cpp-restsdk/client/model/Order.h

@@ -4,11 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI-Generator 6.0.0-SNAPSHOT.
-=======
- * NOTE: This class is auto generated by OpenAPI-Generator 5.3.0-SNAPSHOT.
->>>>>>> origin/5.3.x
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/client/petstore/cpp-restsdk/client/model/Pet.cpp

@@ -4,11 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI-Generator 6.0.0-SNAPSHOT.
-=======
- * NOTE: This class is auto generated by OpenAPI-Generator 5.3.0-SNAPSHOT.
->>>>>>> origin/5.3.x
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/client/petstore/cpp-restsdk/client/model/Pet.h

@@ -4,11 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI-Generator 6.0.0-SNAPSHOT.
-=======
- * NOTE: This class is auto generated by OpenAPI-Generator 5.3.0-SNAPSHOT.
->>>>>>> origin/5.3.x
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/client/petstore/cpp-restsdk/client/model/Tag.cpp

@@ -4,11 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI-Generator 6.0.0-SNAPSHOT.
-=======
- * NOTE: This class is auto generated by OpenAPI-Generator 5.3.0-SNAPSHOT.
->>>>>>> origin/5.3.x
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/client/petstore/cpp-restsdk/client/model/Tag.h

@@ -4,11 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI-Generator 6.0.0-SNAPSHOT.
-=======
- * NOTE: This class is auto generated by OpenAPI-Generator 5.3.0-SNAPSHOT.
->>>>>>> origin/5.3.x
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/client/petstore/cpp-restsdk/client/model/User.cpp

@@ -4,11 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI-Generator 6.0.0-SNAPSHOT.
-=======
- * NOTE: This class is auto generated by OpenAPI-Generator 5.3.0-SNAPSHOT.
->>>>>>> origin/5.3.x
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/client/petstore/cpp-restsdk/client/model/User.h

@@ -4,11 +4,7 @@
  *
  * The version of the OpenAPI document: 1.0.0
  *
-<<<<<<< HEAD
  * NOTE: This class is auto generated by OpenAPI-Generator 6.0.0-SNAPSHOT.
-=======
- * NOTE: This class is auto generated by OpenAPI-Generator 5.3.0-SNAPSHOT.
->>>>>>> origin/5.3.x
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/client/petstore/cpp-tiny/.openapi-generator/VERSION

@@ -1 +1 @@
-5.3.0-SNAPSHOT
+6.0.0-SNAPSHOT

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

@@ -1,5 +1 @@
-<<<<<<< HEAD
 6.0.0-SNAPSHOT
-=======
-5.3.0-SNAPSHOT
->>>>>>> origin/5.3.x

samples/client/petstore/crystal/.travis.yml

@@ -5,11 +5,7 @@
 #The version of the OpenAPI document: 1.0.0
 #
 #Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 #OpenAPI Generator version: 6.0.0-SNAPSHOT
-=======
-#OpenAPI Generator version: 5.3.0-SNAPSHOT
->>>>>>> origin/5.3.x
 #
 
 language: crystal

samples/client/petstore/crystal/spec/spec_helper.cr

@@ -5,11 +5,7 @@
 #The version of the OpenAPI document: 1.0.0
 #
 #Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 #OpenAPI Generator version: 6.0.0-SNAPSHOT
-=======
-#OpenAPI Generator version: 5.3.0-SNAPSHOT
->>>>>>> origin/5.3.x
 #
 
 # load modules

samples/client/petstore/crystal/src/petstore.cr

@@ -5,11 +5,7 @@
 #The version of the OpenAPI document: 1.0.0
 #
 #Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 #OpenAPI Generator version: 6.0.0-SNAPSHOT
-=======
-#OpenAPI Generator version: 5.3.0-SNAPSHOT
->>>>>>> origin/5.3.x
 #
 
 # Dependencies

samples/client/petstore/crystal/src/petstore/api/pet_api.cr

@@ -5,11 +5,7 @@
 #The version of the OpenAPI document: 1.0.0
 #
 #Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 #OpenAPI Generator version: 6.0.0-SNAPSHOT
-=======
-#OpenAPI Generator version: 5.3.0-SNAPSHOT
->>>>>>> origin/5.3.x
 #
 
 require "uri"

samples/client/petstore/crystal/src/petstore/api/store_api.cr

@@ -5,11 +5,7 @@
 #The version of the OpenAPI document: 1.0.0
 #
 #Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 #OpenAPI Generator version: 6.0.0-SNAPSHOT
-=======
-#OpenAPI Generator version: 5.3.0-SNAPSHOT
->>>>>>> origin/5.3.x
 #
 
 require "uri"

samples/client/petstore/crystal/src/petstore/api/user_api.cr

@@ -5,11 +5,7 @@
 #The version of the OpenAPI document: 1.0.0
 #
 #Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 #OpenAPI Generator version: 6.0.0-SNAPSHOT
-=======
-#OpenAPI Generator version: 5.3.0-SNAPSHOT
->>>>>>> origin/5.3.x
 #
 
 require "uri"

samples/client/petstore/crystal/src/petstore/api_client.cr

@@ -5,11 +5,7 @@
 #The version of the OpenAPI document: 1.0.0
 #
 #Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 #OpenAPI Generator version: 6.0.0-SNAPSHOT
-=======
-#OpenAPI Generator version: 5.3.0-SNAPSHOT
->>>>>>> origin/5.3.x
 #
 
 require "json"

samples/client/petstore/crystal/src/petstore/api_error.cr

@@ -5,11 +5,7 @@
 #The version of the OpenAPI document: 1.0.0
 #
 #Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 #OpenAPI Generator version: 6.0.0-SNAPSHOT
-=======
-#OpenAPI Generator version: 5.3.0-SNAPSHOT
->>>>>>> origin/5.3.x
 #
 
 module Petstore

samples/client/petstore/crystal/src/petstore/configuration.cr

@@ -5,11 +5,7 @@
 #The version of the OpenAPI document: 1.0.0
 #
 #Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 #OpenAPI Generator version: 6.0.0-SNAPSHOT
-=======
-#OpenAPI Generator version: 5.3.0-SNAPSHOT
->>>>>>> origin/5.3.x
 #
 
 require "log"

samples/client/petstore/crystal/src/petstore/models/api_response.cr

@@ -5,11 +5,7 @@
 #The version of the OpenAPI document: 1.0.0
 #
 #Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 #OpenAPI Generator version: 6.0.0-SNAPSHOT
-=======
-#OpenAPI Generator version: 5.3.0-SNAPSHOT
->>>>>>> origin/5.3.x
 #
 
 require "json"

samples/client/petstore/crystal/src/petstore/models/category.cr

@@ -5,11 +5,7 @@
 #The version of the OpenAPI document: 1.0.0
 #
 #Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 #OpenAPI Generator version: 6.0.0-SNAPSHOT
-=======
-#OpenAPI Generator version: 5.3.0-SNAPSHOT
->>>>>>> origin/5.3.x
 #
 
 require "json"

samples/client/petstore/crystal/src/petstore/models/order.cr

@@ -5,11 +5,7 @@
 #The version of the OpenAPI document: 1.0.0
 #
 #Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 #OpenAPI Generator version: 6.0.0-SNAPSHOT
-=======
-#OpenAPI Generator version: 5.3.0-SNAPSHOT
->>>>>>> origin/5.3.x
 #
 
 require "json"

samples/client/petstore/crystal/src/petstore/models/pet.cr

@@ -5,11 +5,7 @@
 #The version of the OpenAPI document: 1.0.0
 #
 #Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 #OpenAPI Generator version: 6.0.0-SNAPSHOT
-=======
-#OpenAPI Generator version: 5.3.0-SNAPSHOT
->>>>>>> origin/5.3.x
 #
 
 require "json"

samples/client/petstore/crystal/src/petstore/models/tag.cr

@@ -5,11 +5,7 @@
 #The version of the OpenAPI document: 1.0.0
 #
 #Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 #OpenAPI Generator version: 6.0.0-SNAPSHOT
-=======
-#OpenAPI Generator version: 5.3.0-SNAPSHOT
->>>>>>> origin/5.3.x
 #
 
 require "json"

samples/client/petstore/crystal/src/petstore/models/user.cr

@@ -5,11 +5,7 @@
 #The version of the OpenAPI document: 1.0.0
 #
 #Generated by: https://openapi-generator.tech
-<<<<<<< HEAD
 #OpenAPI Generator version: 6.0.0-SNAPSHOT
-=======
-#OpenAPI Generator version: 5.3.0-SNAPSHOT
->>>>>>> origin/5.3.x
 #
 
 require "json"

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

@@ -1 +1 @@
-5.3.0-SNAPSHOT
+6.0.0-SNAPSHOT

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

@@ -1,5 +1 @@
-<<<<<<< HEAD
 6.0.0-SNAPSHOT
-=======
-5.3.0-SNAPSHOT
->>>>>>> origin/5.3.x

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

@@ -1,5 +1 @@
-<<<<<<< HEAD
 6.0.0-SNAPSHOT
-=======
-5.3.0-SNAPSHOT
->>>>>>> origin/5.3.x

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

@@ -1,5 +1 @@
-<<<<<<< HEAD
 6.0.0-SNAPSHOT
-=======
-5.3.0-SNAPSHOT
->>>>>>> origin/5.3.x

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

@@ -1,5 +1 @@
-<<<<<<< HEAD
 6.0.0-SNAPSHOT
-=======
-5.3.0-SNAPSHOT
->>>>>>> origin/5.3.x

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

@@ -1,5 +1 @@
-<<<<<<< HEAD
 6.0.0-SNAPSHOT
-=======
-5.3.0-SNAPSHOT
->>>>>>> origin/5.3.x

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

@@ -1,5 +1 @@
-<<<<<<< HEAD
 6.0.0-SNAPSHOT
-=======
-5.3.0-SNAPSHOT
->>>>>>> origin/5.3.x

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

@@ -1,5 +1 @@
-<<<<<<< HEAD
 6.0.0-SNAPSHOT
-=======
-5.3.0-SNAPSHOT
->>>>>>> origin/5.3.x

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

@@ -1,5 +1 @@
-<<<<<<< HEAD
 6.0.0-SNAPSHOT
-=======
-5.3.0-SNAPSHOT
->>>>>>> origin/5.3.x

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

@@ -1,5 +1 @@
-<<<<<<< HEAD
 6.0.0-SNAPSHOT
-=======
-5.3.0-SNAPSHOT
->>>>>>> origin/5.3.x

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

@@ -1,5 +1 @@
-<<<<<<< HEAD
 6.0.0-SNAPSHOT
-=======
-5.3.0-SNAPSHOT
->>>>>>> origin/5.3.x

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

@@ -1,5 +1 @@
-<<<<<<< HEAD
 6.0.0-SNAPSHOT
-=======
-5.3.0-SNAPSHOT
->>>>>>> origin/5.3.x

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

@@ -1,5 +1 @@
-<<<<<<< HEAD
 6.0.0-SNAPSHOT
-=======
-5.3.0-SNAPSHOT
->>>>>>> origin/5.3.x

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

@@ -1,5 +1 @@
-<<<<<<< HEAD
 6.0.0-SNAPSHOT
-=======
-5.3.0-SNAPSHOT
->>>>>>> origin/5.3.x

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

@@ -1,5 +1 @@
-<<<<<<< HEAD
 6.0.0-SNAPSHOT
-=======
-5.3.0-SNAPSHOT
->>>>>>> origin/5.3.x

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

@@ -1,5 +1 @@
-<<<<<<< HEAD
 6.0.0-SNAPSHOT
-=======
-5.3.0-SNAPSHOT
->>>>>>> origin/5.3.x

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

@@ -1,5 +1 @@
-<<<<<<< HEAD
 6.0.0-SNAPSHOT
-=======
-5.3.0-SNAPSHOT
->>>>>>> origin/5.3.x

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

@@ -1,5 +1 @@
-<<<<<<< HEAD
 6.0.0-SNAPSHOT
-=======
-5.3.0-SNAPSHOT
->>>>>>> origin/5.3.x

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

@@ -1,5 +1 @@
-<<<<<<< HEAD
 6.0.0-SNAPSHOT
-=======
-5.3.0-SNAPSHOT
->>>>>>> origin/5.3.x

samples/client/petstore/java/native-async/.openapi-generator/VERSION

@@ -1,5 +1 @@
-<<<<<<< HEAD
 6.0.0-SNAPSHOT
-=======
-5.3.0-SNAPSHOT
->>>>>>> origin/5.3.x

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

@@ -1,5 +1 @@
-<<<<<<< HEAD
 6.0.0-SNAPSHOT
-=======
-5.3.0-SNAPSHOT
->>>>>>> origin/5.3.x

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

@@ -1,5 +1 @@
-<<<<<<< HEAD
 6.0.0-SNAPSHOT
-=======
-5.3.0-SNAPSHOT
->>>>>>> origin/5.3.x

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

@@ -1,5 +1 @@
-<<<<<<< HEAD
 6.0.0-SNAPSHOT
-=======
-5.3.0-SNAPSHOT
->>>>>>> origin/5.3.x

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

@@ -1,5 +1 @@
-<<<<<<< HEAD
 6.0.0-SNAPSHOT
-=======
-5.3.0-SNAPSHOT
->>>>>>> origin/5.3.x

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

@@ -1,5 +1 @@
-<<<<<<< HEAD
 6.0.0-SNAPSHOT
-=======
-5.3.0-SNAPSHOT
->>>>>>> origin/5.3.x

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

@@ -1,5 +1 @@
-<<<<<<< HEAD
 6.0.0-SNAPSHOT
-=======
-5.3.0-SNAPSHOT
->>>>>>> origin/5.3.x

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

@@ -1,5 +1 @@
-<<<<<<< HEAD
 6.0.0-SNAPSHOT
-=======
-5.3.0-SNAPSHOT
->>>>>>> origin/5.3.x

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

@@ -1,5 +1 @@
-<<<<<<< HEAD
 6.0.0-SNAPSHOT
-=======
-5.3.0-SNAPSHOT
->>>>>>> origin/5.3.x

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

@@ -1,5 +1 @@
-<<<<<<< HEAD
 6.0.0-SNAPSHOT
-=======
-5.3.0-SNAPSHOT
->>>>>>> origin/5.3.x

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

@@ -1,5 +1 @@
-<<<<<<< HEAD
 6.0.0-SNAPSHOT
-=======
-5.3.0-SNAPSHOT
->>>>>>> origin/5.3.x

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

@@ -1,5 +1 @@
-<<<<<<< HEAD
 6.0.0-SNAPSHOT
-=======
-5.3.0-SNAPSHOT
->>>>>>> origin/5.3.x

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

@@ -1,5 +1 @@
-<<<<<<< HEAD
 6.0.0-SNAPSHOT
-=======
-5.3.0-SNAPSHOT
->>>>>>> origin/5.3.x

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

@@ -1,5 +1 @@
-<<<<<<< HEAD
 6.0.0-SNAPSHOT
-=======
-5.3.0-SNAPSHOT
->>>>>>> origin/5.3.x

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

@@ -1,5 +1 @@
-<<<<<<< HEAD
 6.0.0-SNAPSHOT
-=======
-5.3.0-SNAPSHOT
->>>>>>> origin/5.3.x

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

@@ -1,5 +1 @@
-<<<<<<< HEAD
 6.0.0-SNAPSHOT
-=======
-5.3.0-SNAPSHOT
->>>>>>> origin/5.3.x

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

@@ -1,5 +1 @@
-<<<<<<< HEAD
 6.0.0-SNAPSHOT
-=======
-5.3.0-SNAPSHOT
->>>>>>> origin/5.3.x

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

@@ -1,5 +1 @@
-<<<<<<< HEAD
 6.0.0-SNAPSHOT
-=======
-5.3.0-SNAPSHOT
->>>>>>> origin/5.3.x

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

@@ -1,5 +1 @@
-<<<<<<< HEAD
 6.0.0-SNAPSHOT
-=======
-5.3.0-SNAPSHOT
->>>>>>> origin/5.3.x

samples/client/petstore/kotlin-gson/.openapi-generator/VERSION

@@ -1,5 +1 @@
-<<<<<<< HEAD
 6.0.0-SNAPSHOT
-=======
-5.3.0-SNAPSHOT
->>>>>>> origin/5.3.x

samples/client/petstore/kotlin-jackson/.openapi-generator/VERSION

@@ -1,5 +1 @@
-<<<<<<< HEAD
 6.0.0-SNAPSHOT
-=======
-5.3.0-SNAPSHOT
->>>>>>> origin/5.3.x

samples/client/petstore/kotlin-json-request-string/.openapi-generator/VERSION

@@ -1,5 +1 @@
-<<<<<<< HEAD
 6.0.0-SNAPSHOT
-=======
-5.3.0-SNAPSHOT
->>>>>>> origin/5.3.x

samples/client/petstore/kotlin-jvm-okhttp4-coroutines/.openapi-generator/VERSION

@@ -1,5 +1 @@
-<<<<<<< HEAD
 6.0.0-SNAPSHOT
-=======
-5.3.0-SNAPSHOT
->>>>>>> origin/5.3.x