resolve merge conflicts in the core generator files

This commit is contained in:
William Cheng
2020-04-17 16:10:10 +08:00
parent faf6f197be
commit 8fa76843d0
9 changed files with 0 additions and 54 deletions

View File

@@ -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>