From 0a15dbbf2d164786bac56d7de8f966747e497c57 Mon Sep 17 00:00:00 2001
From: ALAMI Adnane <Adnane.Alami@bordeaux-inp.fr>
Date: Wed, 7 May 2025 11:16:12 +0200
Subject: [PATCH] fix: merge errors

---
 config/frontdev.docker-compose.yaml | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/config/frontdev.docker-compose.yaml b/config/frontdev.docker-compose.yaml
index 529ac2c..67ac6f5 100644
--- a/config/frontdev.docker-compose.yaml
+++ b/config/frontdev.docker-compose.yaml
@@ -34,19 +34,19 @@ services:
     depends_on:
       - postgres
 
-  #front:
-  #  build:
-  #    context: ./front/
-  #    dockerfile: Dockerfile
-  #  container_name: MyINPulse-front
-  #  ports:
-  #    - "8080:80"
-
-  back:
+  front:
     build:
-      context: ./MyINPulse-back/
+      context: ./front/
       dockerfile: Dockerfile
-    container_name: MyINPulse-back
+    container_name: MyINPulse-front
     ports:
-      - "8081:8080"
+      - "8080:80"
+
+  #back:
+  #  build:
+  #    context: ./MyINPulse-back/
+  #    dockerfile: Dockerfile
+  #  container_name: MyINPulse-back
+  #  ports:
+  #    - "8081:8080"
   
\ No newline at end of file