loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

fix merge conflicts

Browse Source
This commit is contained in:
William Cheng 2021-01-09 00:50:37 +08:00
parent 64ae0eed04
commit 5e1aa98bb0
4 changed files with 0 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/openapi-generator-gradle-plugin/gradle.properties
View File

@ -1,10 +1,5 @@
# RELEASE_VERSION # RELEASE_VERSION
<<<<<<< HEAD
openApiGeneratorVersion=6.0.0-SNAPSHOT openApiGeneratorVersion=6.0.0-SNAPSHOT
=======
openApiGeneratorVersion=5.1.0-SNAPSHOT
>>>>>>> origin/master
>>>>>>> origin/5.1.x
# /RELEASE_VERSION # /RELEASE_VERSION
# BEGIN placeholders # BEGIN placeholders

4
modules/openapi-generator-maven-plugin/examples/java-client.xml
View File

@ -13,11 +13,7 @@
<groupId>org.openapitools</groupId> <groupId>org.openapitools</groupId>
<artifactId>openapi-generator-maven-plugin</artifactId> <artifactId>openapi-generator-maven-plugin</artifactId>
<!-- RELEASE_VERSION --> <!-- RELEASE_VERSION -->
<<<<<<< HEAD
<version>6.0.0-SNAPSHOT</version> <version>6.0.0-SNAPSHOT</version>
=======
<version>5.1.0-SNAPSHOT</version>
>>>>>>> origin/5.1.x
<!-- /RELEASE_VERSION --> <!-- /RELEASE_VERSION -->
<executions> <executions>
<execution> <execution>

4
modules/openapi-generator-maven-plugin/examples/non-java-invalid-spec.xml
View File

@ -13,11 +13,7 @@
<groupId>org.openapitools</groupId> <groupId>org.openapitools</groupId>
<artifactId>openapi-generator-maven-plugin</artifactId> <artifactId>openapi-generator-maven-plugin</artifactId>
<!-- RELEASE_VERSION --> <!-- RELEASE_VERSION -->
<<<<<<< HEAD
<version>6.0.0-SNAPSHOT</version> <version>6.0.0-SNAPSHOT</version>
=======
<version>5.1.0-SNAPSHOT</version>
>>>>>>> origin/5.1.x
<!-- /RELEASE_VERSION --> <!-- /RELEASE_VERSION -->
<executions> <executions>
<execution> <execution>

4
modules/openapi-generator-maven-plugin/examples/non-java.xml
View File

@ -13,11 +13,7 @@
<groupId>org.openapitools</groupId> <groupId>org.openapitools</groupId>
<artifactId>openapi-generator-maven-plugin</artifactId> <artifactId>openapi-generator-maven-plugin</artifactId>
<!-- RELEASE_VERSION --> <!-- RELEASE_VERSION -->
<<<<<<< HEAD
<version>6.0.0-SNAPSHOT</version> <version>6.0.0-SNAPSHOT</version>
=======
<version>5.1.0-SNAPSHOT</version>
>>>>>>> origin/5.1.x
<!-- /RELEASE_VERSION --> <!-- /RELEASE_VERSION -->
<executions> <executions>
<execution> <execution>