From d8f7d9dc851371201009b9174d68165e429c3d40 Mon Sep 17 00:00:00 2001
From: Paolo Asperti <paolo@asperti.com>
Date: Fri, 1 Oct 2021 15:52:55 +0200
Subject: [PATCH] Update Dockerfile

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

diff --git a/Dockerfile b/Dockerfile
index 852faeb..011edbf 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,11 +1,5 @@
-<<<<<<< HEAD
 FROM alpine:3.14
 RUN \
   apk -U upgrade && apk add mosquitto mosquitto-clients openssl && \
   echo "log_dest stdout" >/etc/mosquitto/mosquitto.conf
-=======
-FROM alpine:3.12
-RUN apk -U upgrade && apk add mosquitto mosquitto-clients openssl
-EXPOSE 8883
->>>>>>> master
 ENTRYPOINT ["mosquitto", "-c", "/etc/mosquitto/mosquitto.conf"]