From 1311774b7c71fe94016a7b2cdf508e3d39114422 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期五, 12 四月 2024 09:46:06 +0800
Subject: [PATCH] Merge branch 'dev-hxb' into wjc_new

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

diff --git a/.gitignore b/.gitignore
index 77bc4c1..fac7ee0 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,8 @@
 .DS_Store
 app/.DS_Store
 
-local.properties
\ No newline at end of file
+
+local.properties
+.idea/workspace.xml
+.idea/
+*.properties

--
Gitblit v1.8.0