From 346e7555844b14547538097ce7c1c73d7010f9da Mon Sep 17 00:00:00 2001
From: shichongfu <shi_chongfu@163.com>
Date: 星期五, 09 六月 2023 17:55:58 +0800
Subject: [PATCH] Merge branch 'master' of http://nonxin.cn:8090/r/project/xnfg

---
 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