From 0cefd65a96a43fbef8f6a49e649a11293ddf6c53 Mon Sep 17 00:00:00 2001
From: equinusocio <astorino.mattia@gmail.com>
Date: Wed, 1 Nov 2017 10:57:51 +0100
Subject: [PATCH] chore: Fix package.json

---
 package.json | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/package.json b/package.json
index 44eb7f4..b67aa77 100644
--- a/package.json
+++ b/package.json
@@ -70,11 +70,7 @@
 		"themes": [
 			{
 				"label": "Material Theme",
-<<<<<<< HEAD
-				"path": "./themes/Material-Theme-Palenight.json",
-=======
 				"path": "./themes/Material-Theme-Default.json",
->>>>>>> 65fc2cae16345c34c34e2475d767d9f5ab18f50b
 				"uiTheme": "vs-dark"
 			}
 		],