fix dockerfile

50fbb8c1 · Benguria Elguezabal, Gorka · e8f8739b · 50fbb8c1
Commit 50fbb8c1 authored 3 years ago by Benguria Elguezabal, Gorka
--- 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