From af430e03b2f1a1db9369b17a96896dcec9217919 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 26 十一月 2024 08:57:25 +0800
Subject: [PATCH] Merge branch 'master' into dev

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

diff --git a/.gitignore b/.gitignore
index cf2c0f4..4abc431 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,7 +19,7 @@
 *.iml
 *.ipr
 *.log
-*.jar
+#*.jar
 
 ### NetBeans ###
 /nbproject/private/

--
Gitblit v1.9.3