fix merge conflicts

This commit is contained in:
William Cheng 2024-04-11 23:37:23 +08:00
parent f0f13cf932
commit c289982848
14 changed files with 0 additions and 56 deletions

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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