From 78f8167844484f8601ac6f4dad84a3eb5097a2fd Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 22 五月 2024 20:20:55 +0800
Subject: [PATCH] Merge branch 'wjc_new' into wxw_new

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

diff --git a/.gitignore b/.gitignore
index f1b4aa2..fac7ee0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -50,3 +50,5 @@
 
 local.properties
 .idea/workspace.xml
+.idea/
+*.properties

--
Gitblit v1.8.0