From 9a84ef06adff44bc6e24caa8bc16731eff061f3c Mon Sep 17 00:00:00 2001
From: Lawrence <1934378145@qq.com>
Date: 星期日, 25 十月 2020 00:29:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'upstream/master' into master

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

diff --git a/.gitignore b/.gitignore
index d76c026..0c96aaf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,7 +11,7 @@
 .mtj.tmp/
 
 # Package Files #
-*.jar
+#*.jar
 *.war
 *.nar
 *.ear

--
Gitblit v1.8.0