From b7b331dd28ff0fb9763c20c8cc65c0c69cf460c8 Mon Sep 17 00:00:00 2001
From: "jakob.stendahl" <jakob.stendahl@infomedia.dk>
Date: Sun, 15 Jan 2023 22:48:27 +0100
Subject: Fix error in deploy script

---
 deploy.sh         | 11 -----------
 package-lock.json |  4 ++--
 package.json      |  2 +-
 3 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/deploy.sh b/deploy.sh
index 9b8ab74..bb3f79b 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -53,7 +53,6 @@ git add .
 git commit -m ":rocket: Deploy app v$VERSION"
 
 tput setaf 4
-<<<<<<< Updated upstream
 echo "> Return to main branch and tag last commit"
 tput sgr0
 
@@ -62,15 +61,5 @@ git checkout main
 #git tag "v$VERSION"
 
 git push -f origin main
-=======
-echo "> Return to main branch and tag last commit"
-tput sgr0
-
-git checkout main
-
-#git tag "v$VERSION"
-
-git push -f origin main
->>>>>>> Stashed changes
 #git push origin "v$VERSION"
 git push origin gh-pages
diff --git a/package-lock.json b/package-lock.json
index f690da2..eb14828 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "microbit-gamepad",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "microbit-gamepad",
-      "version": "1.0.1",
+      "version": "1.0.2",
       "license": "MIT",
       "dependencies": {
         "@fortawesome/fontawesome-free": "^5.15.2"
diff --git a/package.json b/package.json
index 4698651..e195b30 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "microbit-gamepad",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "",
   "license": "MIT",
   "scripts": {
-- 
cgit v1.2.3