From d332a772c0cabc58d47f0afc4ae92fc55115ce3d Mon Sep 17 00:00:00 2001
From: qx <1084500556@qq.com>
Date: 星期一, 28 七月 2025 10:39:50 +0800
Subject: [PATCH] qx

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

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

--
Gitblit v1.8.0