update meta-codegen

This commit is contained in:
William Cheng 2021-01-08 21:55:56 +08:00
parent 18bec1da28
commit 1aa83b978b
2 changed files with 1 additions and 9 deletions

View File

@ -121,11 +121,7 @@
</dependencies> </dependencies>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<<<<<<< HEAD
<openapi-generator-version>5.1.0-SNAPSHOT</openapi-generator-version> <openapi-generator-version>5.1.0-SNAPSHOT</openapi-generator-version>
=======
<openapi-generator-version>5.0.1-SNAPSHOT</openapi-generator-version>
>>>>>>> origin/master
<maven-plugin-version>1.0.0</maven-plugin-version> <maven-plugin-version>1.0.0</maven-plugin-version>
<junit-version>4.8.1</junit-version> <junit-version>4.8.1</junit-version>
</properties> </properties>

View File

@ -1,5 +1 @@
<<<<<<< HEAD 5.1.0-SNAPSHOT
5.1.0-SNAPSHOT
=======
5.0.1-SNAPSHOT
>>>>>>> origin/master