From e2ce0493b0978ed2706eed28555bd83ed329cb97 Mon Sep 17 00:00:00 2001
From: qx <1084500556@qq.com>
Date: 星期四, 24 七月 2025 11:36:12 +0800
Subject: [PATCH] qx

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

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

--
Gitblit v1.8.0