From ea7ea2ec59a50db2fec8228efc81a63afd8283de Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 21 二月 2022 10:40:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

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

diff --git a/.gitignore b/.gitignore
index 2c0e049..9e33968 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,11 +25,13 @@
 *.iml
 *.ipr
 
+### JRebel ###
+rebel.xml
+
 ### NetBeans ###
 nbproject/private/
 build/*
 nbbuild/
-dist/
 nbdist/
 .nb-gradle/
 

--
Gitblit v1.9.3