forked from loafle/openapi-generator-original
Merge remote-tracking branch 'origin/master' into 4.1.x
This commit is contained in:
@@ -1,5 +1,9 @@
|
||||
/**
|
||||
<<<<<<< HEAD
|
||||
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT).
|
||||
=======
|
||||
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT).
|
||||
>>>>>>> origin/master
|
||||
* https://openapi-generator.tech
|
||||
* Do not edit the class manually.
|
||||
*/
|
||||
|
||||
@@ -1,5 +1,9 @@
|
||||
/**
|
||||
<<<<<<< HEAD
|
||||
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT).
|
||||
=======
|
||||
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT).
|
||||
>>>>>>> origin/master
|
||||
* https://openapi-generator.tech
|
||||
* Do not edit the class manually.
|
||||
*/
|
||||
|
||||
@@ -1,5 +1,9 @@
|
||||
/**
|
||||
<<<<<<< HEAD
|
||||
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT).
|
||||
=======
|
||||
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT).
|
||||
>>>>>>> origin/master
|
||||
* https://openapi-generator.tech
|
||||
* Do not edit the class manually.
|
||||
*/
|
||||
|
||||
@@ -1,5 +1,9 @@
|
||||
/**
|
||||
<<<<<<< HEAD
|
||||
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT).
|
||||
=======
|
||||
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT).
|
||||
>>>>>>> origin/master
|
||||
* https://openapi-generator.tech
|
||||
* Do not edit the class manually.
|
||||
*/
|
||||
|
||||
@@ -1,5 +1,9 @@
|
||||
/**
|
||||
<<<<<<< HEAD
|
||||
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT).
|
||||
=======
|
||||
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT).
|
||||
>>>>>>> origin/master
|
||||
* https://openapi-generator.tech
|
||||
* Do not edit the class manually.
|
||||
*/
|
||||
|
||||
@@ -1,5 +1,9 @@
|
||||
/**
|
||||
<<<<<<< HEAD
|
||||
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.1.0-SNAPSHOT).
|
||||
=======
|
||||
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.0.2-SNAPSHOT).
|
||||
>>>>>>> origin/master
|
||||
* https://openapi-generator.tech
|
||||
* Do not edit the class manually.
|
||||
*/
|
||||
|
||||
Reference in New Issue
Block a user