forked from loafle/openapi-generator-original
resolve merge conflicts in the core generator files
This commit is contained in:
@@ -19,11 +19,7 @@
|
||||
<groupId>org.openapitools</groupId>
|
||||
<artifactId>openapi-generator-maven-plugin</artifactId>
|
||||
<!-- RELEASE_VERSION -->
|
||||
<<<<<<< HEAD
|
||||
<version>5.0.0-SNAPSHOT</version>
|
||||
=======
|
||||
<version>4.3.1-SNAPSHOT</version>
|
||||
>>>>>>> origin/master
|
||||
<!-- /RELEASE_VERSION -->
|
||||
<dependencies>
|
||||
<dependency>
|
||||
|
||||
Reference in New Issue
Block a user