From 558b016aefab336ee753a743aa57970c47e5a5ca Mon Sep 17 00:00:00 2001
From: lkk <364857242@qq.com>
Date: 星期五, 01 八月 2025 11:38:04 +0800
Subject: [PATCH] 1

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

diff --git a/public/yuanqu.ini b/public/yuanqu.ini
index a4bb16d..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