From 04c10c748a1dd292a57a44ea181e3086b9aea5a7 Mon Sep 17 00:00:00 2001
From: Griefed <griefed@griefed.de>
Date: Sun, 28 Aug 2022 15:43:34 +0200
Subject: [PATCH] Update Dockerfile
---
Dockerfile | 4 ----
1 file changed, 4 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 7628dac..fba66bb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -72,11 +72,7 @@ RUN \
npm install -g \
@quasar/cli && \
echo "**** Installing act ****" && \
-<<<<<<< HEAD
- curl https://raw.githubusercontent.com/nektos/act/b23bbefc365012886192e477a88d38a0909ecba1/install.sh | sudo bash && \
-=======
curl https://raw.githubusercontent.com/nektos/act/b23bbefc365012886192e477a88d38a0909ecba1/install.sh | bash && \
->>>>>>> 209e392b842f6e294c372a52a55b65b3bcb205a3
echo "**** Cleanup ****" && \
rm -rf \
/var/cache/apk/* \
--
GitLab