From 97ddbdb0827051db8fb25e42b964185fa6a9a3b5 Mon Sep 17 00:00:00 2001
From: lkk <364857242@qq.com>
Date: 星期三, 30 七月 2025 18:03:46 +0800
Subject: [PATCH] 心电检查

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

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

--
Gitblit v1.8.0