From 880aed0e6b494955fca2632832272a32fdd6eceb Mon Sep 17 00:00:00 2001
From: ericrius1 <ericrius1>
Date: Mon, 30 Nov 2015 18:29:20 -0800
Subject: [PATCH] fixed missing brace

---
 unpublishedScripts/hiddenEntityReset.js |  1 -
 unpublishedScripts/masterReset.js       | 11 ++++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/unpublishedScripts/hiddenEntityReset.js b/unpublishedScripts/hiddenEntityReset.js
index f5cb022783..003eb77d48 100644
--- a/unpublishedScripts/hiddenEntityReset.js
+++ b/unpublishedScripts/hiddenEntityReset.js
@@ -262,7 +262,6 @@
         }
 
 
->>>>>>> master
         function createFire() {
 
 
diff --git a/unpublishedScripts/masterReset.js b/unpublishedScripts/masterReset.js
index af91c457a4..e2f7da50cf 100644
--- a/unpublishedScripts/masterReset.js
+++ b/unpublishedScripts/masterReset.js
@@ -121,8 +121,8 @@ MasterReset = function() {
             z: 503.91
         });
 
-        createBow();
 
+        createBow();
     }
 
     function deleteAllToys() {
@@ -137,6 +137,7 @@ MasterReset = function() {
         });
     }
 
+
     function createGun(position) {
         var modelURL = "https://s3.amazonaws.com/hifi-public/eric/models/gun.fbx";
 
@@ -157,7 +158,11 @@ MasterReset = function() {
                 blue: 20
             },
             shapeType: 'box',
-            gravity: {x: 0, y: -5.0, z: 0},
+            gravity: {
+                x: 0,
+                y: -5.0,
+                z: 0
+            },
             restitution: 0,
             collisionsWillMove: true,
             collisionSoundURL: "https://s3.amazonaws.com/hifi-public/sounds/Guns/Gun_Drop_and_Metalli_1.wav",
@@ -178,6 +183,7 @@ MasterReset = function() {
                 }
             })
         });
+    }
 
     function createBow() {
 
@@ -232,7 +238,6 @@ MasterReset = function() {
                 }
             })
         });
-
     }
 
     function createFire() {