From 894f7ef742f0b1ac7c270d0cdc146fff90d4f29a Mon Sep 17 00:00:00 2001
From: David Palm <dvdplm@gmail.com>
Date: Fri, 26 Mar 2021 12:30:12 +0100
Subject: [PATCH] merge

---
 backend/Dockerfile | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/backend/Dockerfile b/backend/Dockerfile
index 5bb29ea..8178129 100644
--- a/backend/Dockerfile
+++ b/backend/Dockerfile
@@ -1,11 +1,6 @@
 #### BUILDER IMAGE -- quite big one ####
-<<<<<<< HEAD
-FROM paritytech/musl-ci-linux as builder
-LABEL maintainer="Parity Technologies"
-=======
 FROM paritytech/ci-linux:production as builder
-LABEL maintainer="Daniel Maricic daniel@woss.io"
->>>>>>> origin/master
+LABEL maintainer="Parity Technologies"
 LABEL description="Polkadot Telemetry backend builder image"
 
 ARG PROFILE=release