fix: resolve deployment compose conflicts

deploy/dev/docker-compose.yml

@@ -36,18 +36,9 @@ services:
       NODE_ENV: development
       DATABASE_URL: postgresql://tiptop:tiptop_dev_password@postgres:5432/the_tip_top_db
       JWT_SECRET: dev_secret_change_me
-<<<<<<< HEAD
       APP_URL: https://api-dev.dsp5-archi-o24a-4-5-g4.fr
       API_PUBLIC_URL: https://api-dev.dsp5-archi-o24a-4-5-g4.fr
-=======
-      APP_URL: http://192.168.1.23:5001
-      FRONTEND_URL: http://192.168.1.23:5173
-      MAIL_HOST: smtp.gmail.com
-      MAIL_PORT: 587
-      MAIL_USER: ""
-      MAIL_PASS: ""
-      MAIL_FROM: "The Tip Top <no-reply@tiptop.local>"
->>>>>>> github/Emmanuel
+      FRONTEND_URL: https://dev.dsp5-archi-o24a-4-5-g4.fr
 
       # Injectés par le pipeline, jamais commités. Vides, les routes de
       # connexion externe répondent 503 sans bloquer le démarrage.