From 2a6773c83b49ce6d715720aa7813e737afdfa2cb Mon Sep 17 00:00:00 2001
From: Alexis Rondeau <alexis.rondeau@gmail.com>
Date: Sat, 27 Nov 2021 14:32:47 +0100
Subject: [PATCH] Bumps version to 0.1.2

---
 README.md    | 1 -
 package.json | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/README.md b/README.md
index ec80e3a..d723469 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,6 @@ A qualitative analysis tool for the Algorand blockchain
 - Double-click to mount .dmg
 - Drag Algorand Ballet to your Application folder
 - Double-click the application to start
-<<<<<<< HEAD
 
 #### _If_ the application does not open right away
 
diff --git a/package.json b/package.json
index 398e3ab..2e1ddba 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "algorand-ballet",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "appId": "com.alexisrondeau.algorand-ballet",
   "productName": "Algorand Ballet",
   "description": "A qualitative analysis tool for the Algorand blockchain",