From ed1bb201eabb0061f038359e04457b998edb1ae5 Mon Sep 17 00:00:00 2001
From: qx <1084500556@qq.com>
Date: 星期五, 01 八月 2025 14:59:48 +0800
Subject: [PATCH] Merge branch 'master' of http://101.42.27.146:5001/r/ltkj_peisweb_region

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

diff --git a/public/yuanqu.ini b/public/yuanqu.ini
index d1f03b7..a4bb16d 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
 8095=jdczgzyy
 8096=sqyy
 8097=wbzxyy

--
Gitblit v1.8.0