From 1aa83b978b77edf9dae621fd1aaba68a5967b1c5 Mon Sep 17 00:00:00 2001
From: William Cheng <wing328hk@gmail.com>
Date: Fri, 8 Jan 2021 21:55:56 +0800
Subject: [PATCH] update meta-codegen

---
 samples/meta-codegen/lib/pom.xml                      | 4 ----
 samples/meta-codegen/usage/.openapi-generator/VERSION | 6 +-----
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/samples/meta-codegen/lib/pom.xml b/samples/meta-codegen/lib/pom.xml
index 6449d694d5d..8b0799d9488 100644
--- a/samples/meta-codegen/lib/pom.xml
+++ b/samples/meta-codegen/lib/pom.xml
@@ -121,11 +121,7 @@
     </dependencies>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-<<<<<<< HEAD
         <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>
         <junit-version>4.8.1</junit-version>
     </properties>
diff --git a/samples/meta-codegen/usage/.openapi-generator/VERSION b/samples/meta-codegen/usage/.openapi-generator/VERSION
index 8dbad87bded..c30f0ec2be7 100644
--- a/samples/meta-codegen/usage/.openapi-generator/VERSION
+++ b/samples/meta-codegen/usage/.openapi-generator/VERSION
@@ -1,5 +1 @@
-<<<<<<< HEAD
-5.1.0-SNAPSHOT
-=======
-5.0.1-SNAPSHOT
->>>>>>> origin/master
+5.1.0-SNAPSHOT
\ No newline at end of file