From 8fa80f89350d525e6f0d774041be6efed9108f81 Mon Sep 17 00:00:00 2001
From: Preston Bezos <preston@highfidelity.io>
Date: Wed, 12 Jun 2019 14:57:37 -0700
Subject: [PATCH] fixed some formatting problems

---
 scripts/simplifiedUI/ui/simplifiedUI.js | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/scripts/simplifiedUI/ui/simplifiedUI.js b/scripts/simplifiedUI/ui/simplifiedUI.js
index 91d8096881..84ee93ecbf 100644
--- a/scripts/simplifiedUI/ui/simplifiedUI.js
+++ b/scripts/simplifiedUI/ui/simplifiedUI.js
@@ -457,19 +457,9 @@ function onGeometryChanged(rect) {
     }
 }
 
-<<<<<<< HEAD
-=======
-var TIMEOUT_BEFORE_REHIDE_TOOLBAR_MS = 700;
->>>>>>> f360adccbc827bb52dc4a73ebe2c6890e8be039e
 function onDisplayModeChanged(isHMDMode) {
     if (isHMDMode) {
         Camera.setModeString("first person");
-    } else if (Settings.getValue("simplifiedUI/keepExistingUIAndScripts", false)) {
-        // works for now, but not a permanent fix by any means.
-        Script.setTimeout(function () {
-            var toolbar = Toolbars.getToolbar(TOOLBAR_NAME);
-            toolbar.writeProperty("visible", false);
-        }, TIMEOUT_BEFORE_REHIDE_TOOLBAR_MS);
     }
 }