From f151e203da870dbe281defcb1daf84a1a38ecac1 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 29 十二月 2025 09:59:57 +0800
Subject: [PATCH] Merge branch 'master' into google

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

diff --git a/.gitignore b/.gitignore
index 43124f4..1e03bd0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -49,3 +49,8 @@
 
 
 local.properties
+.idea/workspace.xml
+.idea/
+*.properties
+local.properties
+local.properties

--
Gitblit v1.8.0