From 5eea8066e149ade255d1440b350be6a8ee93b848 Mon Sep 17 00:00:00 2001
From: lkk <364857242@qq.com>
Date: 星期一, 11 八月 2025 18:35:57 +0800
Subject: [PATCH] 1

---
 public/yuanqu.ini |    9 ++-------
 1 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/public/yuanqu.ini b/public/yuanqu.ini
index d1f03b7..c5febd9 100644
--- a/public/yuanqu.ini
+++ b/public/yuanqu.ini
@@ -1,12 +1,7 @@
 [development]
 8094=pbkwyy
-<<<<<<< HEAD
-81=xatlgcyy
-82=sqyy
-=======
-81=jdczgzyy
-82=bjxjyy
->>>>>>> 97ddbdb0827051db8fb25e42b964185fa6a9a3b5
+81=bjfhyy
+82=jdczgzyy
 8095=jdczgzyy
 8096=sqyy
 8097=wbzxyy

--
Gitblit v1.8.0