From 849a9907e793fed3bb18df542090e4a1f4e4f429 Mon Sep 17 00:00:00 2001
From: Mr.Zhang <710666463@qq.com>
Date: 星期一, 28 八月 2023 11:58:55 +0800
Subject: [PATCH] 冲突

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

diff --git a/server/.gitignore b/server/.gitignore
index 5003e5f..1bb1e75 100644
--- a/server/.gitignore
+++ b/server/.gitignore
@@ -21,5 +21,5 @@
 tmp
 
 # Package Files #
-*.jar
+#*.jar
 *.war

--
Gitblit v1.9.3