Mobile Client: Fix Merge on docker compose

2026-06-02 02:46:15 +00:00 · 2022-03-03 09:23:14 +01:00
parent 0e09d2b683
commit 048c63fedb
1 changed files with 0 additions and 4 deletions
@@ -44,12 +44,8 @@ services:
      - "api"
    environment:
      - YOUTUBE_KEY=${YOUTUBE_KEY}
-<<<<<<< HEAD
-=======
      - WORKER_API_URL=${WORKER_API_URL}
      - WORKER_API_KEY=${WORKER_API_KEY}
->>>>>>> 6e1880a441c6f538f6a35085b547e8bf93467405
-
 volumes:
  apk: