rparodi/ft_transcendence
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fighting git conflicts

Browse source
This commit is contained in:
apetitco 2025-12-19 15:16:02 +01:00
parent 8898d53526
commit 04c598bed3
11 changed files with 55 additions and 1321 deletions
Download patch file Download diff file Expand all files Collapse all files

3
docker-compose.yml
View file

@ -67,8 +67,6 @@ services:
gelf-address: "udp://127.0.0.1:12201"
tag: "{{.Name}}"
<<<<<<< HEAD
=======
###############
# TIC-TAC-TOE #
###############
@ -92,7 +90,6 @@ services:
###############
# CHAT #
###############
>>>>>>> 16e6ae0 ((schism): started separating backend from frontend)
chat:
build:
context: ./src/