From 699d0c50940e955be4074cbd757746d75b21e58e Mon Sep 17 00:00:00 2001
From: 0x07CB <83157348+0x07CB@users.noreply.github.com>
Date: Wed, 22 Jun 2022 01:32:31 +0200
Subject: [PATCH] Update Dockerfile

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

diff --git a/Dockerfile b/Dockerfile
index 37ae98b..b5b0a5a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,10 +1,5 @@
 FROM alpine:latest
-<<<<<<< HEAD
-RUN apk add --no-cache python3 py3-pip nano curl
-
-ENTRYPOINT [ "nano" ]
-=======
 RUN apk add --no-cache python3 py3-pip nano curl
 RUN curl https://raw.githubusercontent.com/scopatz/nanorc/master/install.sh | sh
 ENTRYPOINT [ "nano" ]
->>>>>>> f33ef8703131441ef30407f97c5f79b85a74dd80
+