From 50fbb8c18539c10cd2c8a78498adf6dcbbf0b396 Mon Sep 17 00:00:00 2001
From: Gorka Benguria <gorka.benguria@tecnalia.com>
Date: Fri, 11 Feb 2022 14:28:44 +0100
Subject: [PATCH] fix dockerfile

---
 Dockerfile | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 7d2eac8d..99a4b6f8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -35,5 +35,3 @@ ENV DASHBOARD_BASE_URL=http://localhost:4200 \
 	DASHBOARD_CTRL_API_BASE_URL=http://localhost:8085 \
 	BUS_OD_API_BASE_URL=http://localhost:8000/busesod \
 	BIKETRAJECTORY_API_BASE_URL=http://localhost:8000/urbanite_biketrajectories
-
->>>>>>> Dockerfile
-- 
GitLab