ci: 🎡 删冲突标记

2025-09-27 11:23:04 +08:00 · 2025-09-27 11:23:04 +08:00 · 46f258dd97
commit 46f258dd97
parent 718f84b8a4
1 changed files with 0 additions and 1 deletions
--- 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