forked from loafle/openapi-generator-original
fix merge conflicts
This commit is contained in:
parent
64ae0eed04
commit
5e1aa98bb0
@ -1,10 +1,5 @@
|
||||
# RELEASE_VERSION
|
||||
<<<<<<< HEAD
|
||||
openApiGeneratorVersion=6.0.0-SNAPSHOT
|
||||
=======
|
||||
openApiGeneratorVersion=5.1.0-SNAPSHOT
|
||||
>>>>>>> origin/master
|
||||
>>>>>>> origin/5.1.x
|
||||
# /RELEASE_VERSION
|
||||
|
||||
# BEGIN placeholders
|
||||
|
@ -13,11 +13,7 @@
|
||||
<groupId>org.openapitools</groupId>
|
||||
<artifactId>openapi-generator-maven-plugin</artifactId>
|
||||
<!-- RELEASE_VERSION -->
|
||||
<<<<<<< HEAD
|
||||
<version>6.0.0-SNAPSHOT</version>
|
||||
=======
|
||||
<version>5.1.0-SNAPSHOT</version>
|
||||
>>>>>>> origin/5.1.x
|
||||
<!-- /RELEASE_VERSION -->
|
||||
<executions>
|
||||
<execution>
|
||||
|
@ -13,11 +13,7 @@
|
||||
<groupId>org.openapitools</groupId>
|
||||
<artifactId>openapi-generator-maven-plugin</artifactId>
|
||||
<!-- RELEASE_VERSION -->
|
||||
<<<<<<< HEAD
|
||||
<version>6.0.0-SNAPSHOT</version>
|
||||
=======
|
||||
<version>5.1.0-SNAPSHOT</version>
|
||||
>>>>>>> origin/5.1.x
|
||||
<!-- /RELEASE_VERSION -->
|
||||
<executions>
|
||||
<execution>
|
||||
|
@ -13,11 +13,7 @@
|
||||
<groupId>org.openapitools</groupId>
|
||||
<artifactId>openapi-generator-maven-plugin</artifactId>
|
||||
<!-- RELEASE_VERSION -->
|
||||
<<<<<<< HEAD
|
||||
<version>6.0.0-SNAPSHOT</version>
|
||||
=======
|
||||
<version>5.1.0-SNAPSHOT</version>
|
||||
>>>>>>> origin/5.1.x
|
||||
<!-- /RELEASE_VERSION -->
|
||||
<executions>
|
||||
<execution>
|
||||
|
Loading…
x
Reference in New Issue
Block a user