From 7768b430fc3d9d22ae22ec987a34a4532a53f591 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期一, 30 六月 2025 11:10:19 +0800
Subject: [PATCH] Resolve merger conflicts

---
 .github/FUNDING.yml |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
new file mode 100644
index 0000000..fbcab77
--- /dev/null
+++ b/.github/FUNDING.yml
@@ -0,0 +1 @@
+custom: http://doc.ruoyi.vip/ruoyi-vue/other/donate.html

--
Gitblit v1.9.1