From 12990a5138e3fa8874a601bfb784a2b1147f0f24 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Tue, 06 Apr 2021 11:53:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop

---
 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 bcaf6b1..f11f7a0 100644
--- a/zq-erp/pom.xml
+++ b/zq-erp/pom.xml
@@ -401,7 +401,6 @@
 
 
 
-
                     <exclude>**/*.woff</exclude>
                     <exclude>**/*.woff2</exclude>
                     <exclude>**/*.ttf</exclude>

--
Gitblit v1.9.1