From 9386d308d2f1617261c33d69634020e3dc30903b Mon Sep 17 00:00:00 2001
From: 0x07CB <83157348+0x07CB@users.noreply.github.com>
Date: Tue, 21 Jun 2022 23:17:33 +0000
Subject: [PATCH 1/4] nanooo

---
 Dockerfile | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 Dockerfile

diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..1539445
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,4 @@
+FROM alpine:latest
+RUN apk --no-cache python3 py3-pip nano curl
+
+ENTRYPOINT [ "nano" ]
\ No newline at end of file

From f33ef8703131441ef30407f97c5f79b85a74dd80 Mon Sep 17 00:00:00 2001
From: 0x07CB <83157348+0x07CB@users.noreply.github.com>
Date: Wed, 22 Jun 2022 01:19:18 +0200
Subject: [PATCH 2/4] Update Dockerfile

---
 Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 1539445..15e4c3c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
 FROM alpine:latest
 RUN apk --no-cache python3 py3-pip nano curl
-
-ENTRYPOINT [ "nano" ]
\ No newline at end of file
+RUN curl https://raw.githubusercontent.com/scopatz/nanorc/master/install.sh | sh
+ENTRYPOINT [ "nano" ]

From b215f3a4f376a30f0661b36fe3bb655d18f0971c Mon Sep 17 00:00:00 2001
From: 0x07CB <83157348+0x07CB@users.noreply.github.com>
Date: Tue, 21 Jun 2022 23:29:24 +0000
Subject: [PATCH 3/4] maj

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 1539445..bbe1149 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
 FROM alpine:latest
-RUN apk --no-cache python3 py3-pip nano curl
+RUN apk add --no-cache python3 py3-pip nano curl
 
 ENTRYPOINT [ "nano" ]
\ No newline at end of file

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 4/4] 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
+