From 971a24a9e58a21bc306897fd3ad63012a399f7db Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期五, 23 五月 2025 14:07:18 +0800
Subject: [PATCH] Merge branch '1.2.1' into 1.2.0_google

---
 .gitignore |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6d95062..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,3 +47,9 @@
 .DS_Store
 app/.DS_Store
 
+
+local.properties
+.idea/workspace.xml
+.idea/
+*.properties
+local.properties

--
Gitblit v1.8.0