From f91ef956cf482ed4ce0885dc47794b783c20c415 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 30 四月 2025 10:14:43 +0800
Subject: [PATCH] Merge branch '1.2.0' into 1.5.1_google

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

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

--
Gitblit v1.8.0