From aa01870d8f376890e46e5a7f08f635ca47e37327 Mon Sep 17 00:00:00 2001
From: qx <1084500556@qq.com>
Date: 星期二, 19 八月 2025 17:35:07 +0800
Subject: [PATCH] Merge branch 'master' of http://101.42.27.146:5001/r/ltkj_peisweb_region

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

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

--
Gitblit v1.8.0