From bf98ee3c936130bf4df4b2eda1240f61cf380ac3 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 29 十一月 2021 14:03:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into satoken

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

diff --git a/.gitignore b/.gitignore
index fd446f4..4fbb2fe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,7 +29,6 @@
 nbproject/private/
 build/*
 nbbuild/
-dist/
 nbdist/
 .nb-gradle/
 
@@ -37,7 +36,8 @@
 # Others
 *.log
 *.xml.versionsBackup
+*.swp
 
 !*/build/*.java
 !*/build/*.html
-!*/build/*.xml
\ No newline at end of file
+!*/build/*.xml

--
Gitblit v1.9.3