forked from loafle/openapi-generator-original
fix merge conflicts
This commit is contained in:
parent
f0f13cf932
commit
c289982848
@ -6,11 +6,7 @@
|
|||||||
The version of the OpenAPI document: 1.0.0
|
The version of the OpenAPI document: 1.0.0
|
||||||
|
|
||||||
Generated by: https://openapi-generator.tech
|
Generated by: https://openapi-generator.tech
|
||||||
<<<<<<< HEAD
|
|
||||||
OpenAPI Generator version: 8.0.0-SNAPSHOT
|
OpenAPI Generator version: 8.0.0-SNAPSHOT
|
||||||
=======
|
|
||||||
OpenAPI Generator version: 7.2.0-SNAPSHOT
|
|
||||||
>>>>>>> origin/master
|
|
||||||
|
|
||||||
=end
|
=end
|
||||||
|
|
||||||
|
@ -6,11 +6,7 @@
|
|||||||
The version of the OpenAPI document: 1.0.0
|
The version of the OpenAPI document: 1.0.0
|
||||||
|
|
||||||
Generated by: https://openapi-generator.tech
|
Generated by: https://openapi-generator.tech
|
||||||
<<<<<<< HEAD
|
|
||||||
OpenAPI Generator version: 8.0.0-SNAPSHOT
|
OpenAPI Generator version: 8.0.0-SNAPSHOT
|
||||||
=======
|
|
||||||
OpenAPI Generator version: 7.2.0-SNAPSHOT
|
|
||||||
>>>>>>> origin/master
|
|
||||||
|
|
||||||
=end
|
=end
|
||||||
|
|
||||||
|
@ -6,11 +6,7 @@
|
|||||||
The version of the OpenAPI document: 1.0.0
|
The version of the OpenAPI document: 1.0.0
|
||||||
|
|
||||||
Generated by: https://openapi-generator.tech
|
Generated by: https://openapi-generator.tech
|
||||||
<<<<<<< HEAD
|
|
||||||
OpenAPI Generator version: 8.0.0-SNAPSHOT
|
OpenAPI Generator version: 8.0.0-SNAPSHOT
|
||||||
=======
|
|
||||||
OpenAPI Generator version: 7.2.0-SNAPSHOT
|
|
||||||
>>>>>>> origin/master
|
|
||||||
|
|
||||||
=end
|
=end
|
||||||
|
|
||||||
|
@ -6,11 +6,7 @@
|
|||||||
The version of the OpenAPI document: 1.0.0
|
The version of the OpenAPI document: 1.0.0
|
||||||
|
|
||||||
Generated by: https://openapi-generator.tech
|
Generated by: https://openapi-generator.tech
|
||||||
<<<<<<< HEAD
|
|
||||||
OpenAPI Generator version: 8.0.0-SNAPSHOT
|
OpenAPI Generator version: 8.0.0-SNAPSHOT
|
||||||
=======
|
|
||||||
OpenAPI Generator version: 7.2.0-SNAPSHOT
|
|
||||||
>>>>>>> origin/master
|
|
||||||
|
|
||||||
=end
|
=end
|
||||||
|
|
||||||
|
@ -6,11 +6,7 @@
|
|||||||
The version of the OpenAPI document: 1.0.0
|
The version of the OpenAPI document: 1.0.0
|
||||||
|
|
||||||
Generated by: https://openapi-generator.tech
|
Generated by: https://openapi-generator.tech
|
||||||
<<<<<<< HEAD
|
|
||||||
OpenAPI Generator version: 8.0.0-SNAPSHOT
|
OpenAPI Generator version: 8.0.0-SNAPSHOT
|
||||||
=======
|
|
||||||
OpenAPI Generator version: 7.2.0-SNAPSHOT
|
|
||||||
>>>>>>> origin/master
|
|
||||||
|
|
||||||
=end
|
=end
|
||||||
|
|
||||||
|
@ -6,11 +6,7 @@
|
|||||||
The version of the OpenAPI document: 1.0.0
|
The version of the OpenAPI document: 1.0.0
|
||||||
|
|
||||||
Generated by: https://openapi-generator.tech
|
Generated by: https://openapi-generator.tech
|
||||||
<<<<<<< HEAD
|
|
||||||
OpenAPI Generator version: 8.0.0-SNAPSHOT
|
OpenAPI Generator version: 8.0.0-SNAPSHOT
|
||||||
=======
|
|
||||||
OpenAPI Generator version: 7.2.0-SNAPSHOT
|
|
||||||
>>>>>>> origin/master
|
|
||||||
|
|
||||||
=end
|
=end
|
||||||
|
|
||||||
|
@ -6,11 +6,7 @@
|
|||||||
The version of the OpenAPI document: 1.0.0
|
The version of the OpenAPI document: 1.0.0
|
||||||
|
|
||||||
Generated by: https://openapi-generator.tech
|
Generated by: https://openapi-generator.tech
|
||||||
<<<<<<< HEAD
|
|
||||||
OpenAPI Generator version: 8.0.0-SNAPSHOT
|
OpenAPI Generator version: 8.0.0-SNAPSHOT
|
||||||
=======
|
|
||||||
OpenAPI Generator version: 7.2.0-SNAPSHOT
|
|
||||||
>>>>>>> origin/master
|
|
||||||
|
|
||||||
=end
|
=end
|
||||||
|
|
||||||
|
@ -6,11 +6,7 @@
|
|||||||
The version of the OpenAPI document: 1.0.0
|
The version of the OpenAPI document: 1.0.0
|
||||||
|
|
||||||
Generated by: https://openapi-generator.tech
|
Generated by: https://openapi-generator.tech
|
||||||
<<<<<<< HEAD
|
|
||||||
OpenAPI Generator version: 8.0.0-SNAPSHOT
|
OpenAPI Generator version: 8.0.0-SNAPSHOT
|
||||||
=======
|
|
||||||
OpenAPI Generator version: 7.2.0-SNAPSHOT
|
|
||||||
>>>>>>> origin/master
|
|
||||||
|
|
||||||
=end
|
=end
|
||||||
|
|
||||||
|
@ -6,11 +6,7 @@
|
|||||||
The version of the OpenAPI document: 1.0.0
|
The version of the OpenAPI document: 1.0.0
|
||||||
|
|
||||||
Generated by: https://openapi-generator.tech
|
Generated by: https://openapi-generator.tech
|
||||||
<<<<<<< HEAD
|
|
||||||
OpenAPI Generator version: 8.0.0-SNAPSHOT
|
OpenAPI Generator version: 8.0.0-SNAPSHOT
|
||||||
=======
|
|
||||||
OpenAPI Generator version: 7.2.0-SNAPSHOT
|
|
||||||
>>>>>>> origin/master
|
|
||||||
|
|
||||||
=end
|
=end
|
||||||
|
|
||||||
|
@ -6,11 +6,7 @@
|
|||||||
The version of the OpenAPI document: 1.0.0
|
The version of the OpenAPI document: 1.0.0
|
||||||
|
|
||||||
Generated by: https://openapi-generator.tech
|
Generated by: https://openapi-generator.tech
|
||||||
<<<<<<< HEAD
|
|
||||||
OpenAPI Generator version: 8.0.0-SNAPSHOT
|
OpenAPI Generator version: 8.0.0-SNAPSHOT
|
||||||
=======
|
|
||||||
OpenAPI Generator version: 7.2.0-SNAPSHOT
|
|
||||||
>>>>>>> origin/master
|
|
||||||
|
|
||||||
=end
|
=end
|
||||||
|
|
||||||
|
@ -6,11 +6,7 @@
|
|||||||
The version of the OpenAPI document: 1.0.0
|
The version of the OpenAPI document: 1.0.0
|
||||||
|
|
||||||
Generated by: https://openapi-generator.tech
|
Generated by: https://openapi-generator.tech
|
||||||
<<<<<<< HEAD
|
|
||||||
OpenAPI Generator version: 8.0.0-SNAPSHOT
|
OpenAPI Generator version: 8.0.0-SNAPSHOT
|
||||||
=======
|
|
||||||
OpenAPI Generator version: 7.2.0-SNAPSHOT
|
|
||||||
>>>>>>> origin/master
|
|
||||||
|
|
||||||
=end
|
=end
|
||||||
|
|
||||||
|
@ -6,11 +6,7 @@
|
|||||||
The version of the OpenAPI document: 1.0.0
|
The version of the OpenAPI document: 1.0.0
|
||||||
|
|
||||||
Generated by: https://openapi-generator.tech
|
Generated by: https://openapi-generator.tech
|
||||||
<<<<<<< HEAD
|
|
||||||
OpenAPI Generator version: 8.0.0-SNAPSHOT
|
OpenAPI Generator version: 8.0.0-SNAPSHOT
|
||||||
=======
|
|
||||||
OpenAPI Generator version: 7.2.0-SNAPSHOT
|
|
||||||
>>>>>>> origin/master
|
|
||||||
|
|
||||||
=end
|
=end
|
||||||
|
|
||||||
|
@ -6,11 +6,7 @@
|
|||||||
The version of the OpenAPI document: 1.0.0
|
The version of the OpenAPI document: 1.0.0
|
||||||
|
|
||||||
Generated by: https://openapi-generator.tech
|
Generated by: https://openapi-generator.tech
|
||||||
<<<<<<< HEAD
|
|
||||||
OpenAPI Generator version: 8.0.0-SNAPSHOT
|
OpenAPI Generator version: 8.0.0-SNAPSHOT
|
||||||
=======
|
|
||||||
OpenAPI Generator version: 7.2.0-SNAPSHOT
|
|
||||||
>>>>>>> origin/master
|
|
||||||
|
|
||||||
=end
|
=end
|
||||||
|
|
||||||
|
@ -6,11 +6,7 @@
|
|||||||
The version of the OpenAPI document: 1.0.0
|
The version of the OpenAPI document: 1.0.0
|
||||||
|
|
||||||
Generated by: https://openapi-generator.tech
|
Generated by: https://openapi-generator.tech
|
||||||
<<<<<<< HEAD
|
|
||||||
OpenAPI Generator version: 8.0.0-SNAPSHOT
|
OpenAPI Generator version: 8.0.0-SNAPSHOT
|
||||||
=======
|
|
||||||
OpenAPI Generator version: 7.2.0-SNAPSHOT
|
|
||||||
>>>>>>> origin/master
|
|
||||||
|
|
||||||
=end
|
=end
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user