From ce35c534227eb2e14d2969e519ac4e2f72e7bfe2 Mon Sep 17 00:00:00 2001
From: MasonBone <mason.bone1@gmail.com>
Date: Mon, 29 Nov 2021 21:45:37 -0600
Subject: [PATCH] Updating stuff

---
 package.json | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 4142136..00d995a 100644
--- a/package.json
+++ b/package.json
@@ -47,11 +47,11 @@
 				"command": "mind-reader.selectTheme",
 				"title": "Select Theme"
 			},
-<<<<<<< HEAD
+			
 			{
 				"command": "mind-reader.openWebview",
 				"title": "Mind Reader Webview"
-=======
+			},
 
 			{
 				"command": "mind-reader.runLineContext",
@@ -65,7 +65,6 @@
 			{
 				"command": "mind-reader.getIndent",
 				"title": "Get Line Indentation"
->>>>>>> master
 			}
 
 		],