Changeset 1624c61 for ReserveNGo-backend/docker-compose.yml

Timestamp:

04/26/25 19:23:12 (5 days ago)

Author:

Nikola Jordanoski <nikolaj_koko@…>

Branches:

master

Children:

ef1c66e

Parents:

48e50b4 (diff), e2a84e9 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Fix merge conflicts

File:

• ReserveNGo-backend/docker-compose.yml (modified) (1 diff)

ReserveNGo-backend/docker-compose.yml

@@ -4 +4 @@
   wp-db:
     image: "postgres"
-    container_name: "wp2024_resAndGo"
+    container_name: "resAndGo"
     environment:
       - POSTGRES_USER=za123