From f538aef48a6eda583b88cb5d5670fd7f2ed82135 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 21 五月 2024 17:07:15 +0800
Subject: [PATCH] Merge branch 'wjc_new' into lwj_new

---
 .gitignore |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

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

--
Gitblit v1.8.0