From 05b07b8cbb069ecd1cd5d36724c6f484bd83bdc1 Mon Sep 17 00:00:00 2001 From: Felix Ableitner <me@nutomic.com> Date: Fri, 19 Mar 2021 18:09:05 +0100 Subject: [PATCH] Fix conflicts in docker-compose.yml --- docker/federation/docker-compose.yml | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/docker/federation/docker-compose.yml b/docker/federation/docker-compose.yml index 77382899..a29e3cf9 100644 --- a/docker/federation/docker-compose.yml +++ b/docker/federation/docker-compose.yml @@ -29,11 +29,7 @@ services: - ./volumes/pictrs_alpha:/mnt lemmy-alpha-ui: -<<<<<<< HEAD - image: lemmy-ui:test -======= image: dessalines/lemmy-ui:0.10.0-rc.5 ->>>>>>> main environment: - LEMMY_INTERNAL_HOST=lemmy-alpha:8541 - LEMMY_EXTERNAL_HOST=localhost:8541 @@ -62,11 +58,7 @@ services: - ./volumes/postgres_alpha:/var/lib/postgresql/data lemmy-beta-ui: -<<<<<<< HEAD - image: lemmy-ui:test -======= image: dessalines/lemmy-ui:0.10.0-rc.5 ->>>>>>> main environment: - LEMMY_INTERNAL_HOST=lemmy-beta:8551 - LEMMY_EXTERNAL_HOST=localhost:8551 @@ -95,11 +87,7 @@ services: - ./volumes/postgres_beta:/var/lib/postgresql/data lemmy-gamma-ui: -<<<<<<< HEAD - image: lemmy-ui:test -======= image: dessalines/lemmy-ui:0.10.0-rc.5 ->>>>>>> main environment: - LEMMY_INTERNAL_HOST=lemmy-gamma:8561 - LEMMY_EXTERNAL_HOST=localhost:8561 -- 2.44.1