From 87cd5df70918e6ba1af849c5f026d3719bfdb1ac Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 09 四月 2025 09:06:29 +0800
Subject: [PATCH] Merge branch '1.5.2' into dev

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

diff --git a/.gitignore b/.gitignore
index f1b4aa2..eceeb1b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -50,3 +50,6 @@
 
 local.properties
 .idea/workspace.xml
+.idea/
+*.properties
+local.properties

--
Gitblit v1.8.0