forked from loafle/openapi-generator-original
fix merge conflicts
This commit is contained in:
@@ -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>
|
||||
|
||||
Reference in New Issue
Block a user