sync master

This commit is contained in:
William Cheng
2019-06-03 00:32:13 +08:00
parent 8d3a1a5add
commit 7e457f7e41
761 changed files with 123 additions and 3163 deletions

View File

@@ -5,11 +5,7 @@
<parent>
<artifactId>openapi-generator-project</artifactId>
<groupId>org.openapitools</groupId>
<<<<<<< HEAD
<version>4.1.0-SNAPSHOT</version>
=======
<version>4.0.2-SNAPSHOT</version>
>>>>>>> origin/master
<relativePath>../..</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>