From eed4d5b1429796a10f4ce386c10228ab68e270a1 Mon Sep 17 00:00:00 2001
From: Bryan Pedini <b.pedini@bjphoster.com>
Date: Fri, 23 Apr 2021 23:39:19 +0200
Subject: [PATCH] little bugfix

---
 deploy.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/deploy.sh b/deploy.sh
index 4cb7aee..065557b 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -33,7 +33,6 @@ _bash_overrides() {
 
 _cleanup() {
   rm -rf ${THIS}
->>>>>>> master
 }
 
 _main() {