From 8b5311bf84f5c343e1f83a23dbe0477ee6ec4b67 Mon Sep 17 00:00:00 2001
From: Qiuyi LI <qiuyi.li@gmail.com>
Date: Thu, 6 Jul 2023 16:44:39 +0200
Subject: [PATCH] Release note 1.1.0: Use new MabangAPI and add order archiving
 job

---
 pom.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index ef760b81d..2dafd24fd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,6 @@
   <groupId>org.jeecgframework.boot</groupId>
   <artifactId>jeecg-boot-parent</artifactId>
   <version>1.2.0</version>
->>>>>>> a4a96e4a (fix: issue in previous merge)
   <packaging>pom</packaging>
   <name>WIA APP ${project.version} </name>