From 63f54ef5fc90f2ceed55ac2576bb8d62a64fd97d Mon Sep 17 00:00:00 2001
From: lkk <364857242@qq.com>
Date: 星期三, 13 八月 2025 14:27:20 +0800
Subject: [PATCH] 1

---
 public/yuanqu.ini |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)

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

--
Gitblit v1.8.0