From 46f258dd97ef6abe9d8ca4e0f566b697d397dbf7 Mon Sep 17 00:00:00 2001
From: GoCo <guochen0829@163.com>
Date: Sat, 27 Sep 2025 11:23:04 +0800
Subject: [PATCH] =?UTF-8?q?ci:=20=F0=9F=8E=A1=20=E5=88=A0=E5=86=B2?=
 =?UTF-8?q?=E7=AA=81=E6=A0=87=E8=AE=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker-compose.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index eb799268..8b6a7195 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -59,7 +59,6 @@ services:
     image: jeecg-boot-system
     hostname: jeecg-boot-system
     ports:
-<<<<<<< Updated upstream
       - 25525:8080s
     networks:
       - jeecg-boot