ci: 🎡 删冲突标记
This commit is contained in:
parent
718f84b8a4
commit
46f258dd97
@ -59,7 +59,6 @@ services:
|
|||||||
image: jeecg-boot-system
|
image: jeecg-boot-system
|
||||||
hostname: jeecg-boot-system
|
hostname: jeecg-boot-system
|
||||||
ports:
|
ports:
|
||||||
<<<<<<< Updated upstream
|
|
||||||
- 25525:8080s
|
- 25525:8080s
|
||||||
networks:
|
networks:
|
||||||
- jeecg-boot
|
- jeecg-boot
|
||||||
|
Loading…
x
Reference in New Issue
Block a user