From a1c880c476327032fe174af8c80d6f78a590dae9 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期五, 07 二月 2025 16:35:22 +0800
Subject: [PATCH] Merge branch '1.5.1' into dev

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

diff --git a/.gitignore b/.gitignore
index 77bc4c1..eceeb1b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,8 +36,7 @@
 # Proguard folder generated by Eclipse
 proguard/
 
-# Local configuration file (sdk path, etc)
-local.properties
+
 
 # Proguard folder generated by Eclipse
 proguard/
@@ -48,4 +47,9 @@
 .DS_Store
 app/.DS_Store
 
-local.properties
\ No newline at end of file
+
+local.properties
+.idea/workspace.xml
+.idea/
+*.properties
+local.properties

--
Gitblit v1.8.0