From e0ef9fe0ded50ac2c9e40c8616c99007048521c4 Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期日, 29 九月 2024 18:32:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-stander' into master-xlk

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

diff --git a/.gitignore b/.gitignore
index a1c2a23..ae69bc3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,5 @@
 
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
+/.idea
+/hx-parent.iml

--
Gitblit v1.8.0