From 8f7460c6ddff45ec39bf2026d75a3f4e2b26f13d Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Thu, 11 Nov 2021 23:01:58 +0800
Subject: [PATCH] fix conflect
---
zq-erp/pom.xml | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/zq-erp/pom.xml b/zq-erp/pom.xml
index 84c6f8e..304d045 100644
--- a/zq-erp/pom.xml
+++ b/zq-erp/pom.xml
@@ -414,7 +414,6 @@
<exclude>config/xcshop/*</exclude>
<!-- -->
-
<exclude>config/config.json</exclude>
<exclude>config/application.properties</exclude>
<exclude>config/system.properties</exclude>
--
Gitblit v1.9.1