From d8ba5dda56e0065874e9ed707e875732b3af7995 Mon Sep 17 00:00:00 2001
From: 许鹏程 <1821349743@qq.com>
Date: 星期二, 23 五月 2023 15:28:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 product-server-web/.gitignore |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/product-server-web/.gitignore b/product-server-web/.gitignore
index a5e2876..8d1ab79 100644
--- a/product-server-web/.gitignore
+++ b/product-server-web/.gitignore
@@ -7,6 +7,4 @@
 .project
 .settings/
 logs/
-resources/
-pom.xml
 pom.xml_no

--
Gitblit v1.9.2