From 761f4ac65d86778b6fcf21db3d6ff78610830a90 Mon Sep 17 00:00:00 2001
From: lkk <364857242@qq.com>
Date: 星期四, 31 七月 2025 18:03:00 +0800
Subject: [PATCH] Merge branch 'master' of http://101.42.27.146:5001/r/ltkj_peisweb_region

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

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

--
Gitblit v1.8.0