From 795747f40810e9072be3c1cd4ffa9c05cf4e78dd Mon Sep 17 00:00:00 2001
From: ericrius1 <ericrius1>
Date: Mon, 21 Mar 2016 10:23:51 -0700
Subject: [PATCH] merged

---
 unpublishedScripts/DomainContent/Home/reset.js | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/unpublishedScripts/DomainContent/Home/reset.js b/unpublishedScripts/DomainContent/Home/reset.js
index 33a06b8784..a94e457103 100644
--- a/unpublishedScripts/DomainContent/Home/reset.js
+++ b/unpublishedScripts/DomainContent/Home/reset.js
@@ -118,18 +118,6 @@
 
         createDynamicEntities: function() {
 
-<<<<<<< HEAD
-
-            var fishTank = new FishTank({
-                x: 1098.9254,
-                y: 460.5814,
-                z: -79.1103
-            }, {
-                x: 0,
-                y: 152,
-                z: 0
-            });
-=======
             // var fishTank = new FishTank({
             //     x: 1098.9254,
             //     y: 460.5814,
@@ -139,7 +127,7 @@
             //     y: 0,
             //     z: 0
             // });
->>>>>>> james/homereset
+
 
             var tiltMaze = new TiltMaze({
                 x: 1105.5768,