From 4cfedc8d9d8fd2d4e0ffbafdb29dabd47999856a Mon Sep 17 00:00:00 2001
From: DD Liu <liudi@media.mit.edu>
Date: Mon, 15 May 2017 10:18:48 -0400
Subject: [PATCH] fix merge conflicts

---
 src/engine/runtime.js | 24 ++----------------------
 1 file changed, 2 insertions(+), 22 deletions(-)

diff --git a/src/engine/runtime.js b/src/engine/runtime.js
index 3ba622021..ff6a97b45 100644
--- a/src/engine/runtime.js
+++ b/src/engine/runtime.js
@@ -105,17 +105,10 @@ class Runtime extends EventEmitter {
         this._cloneCounter = 0;
 
         /**
-<<<<<<< HEAD
          * List of all monitors.
          */
         this._monitorState = {};
-=======
-         * Flag to emit a targets update at the end of a step. When target data
-         * changes, this flag is set to true.
-         * @type {boolean}
-         */
-        this._refreshTargets = false;
->>>>>>> develop
+
 
         /**
          * Whether the project is in "turbo mode."
@@ -697,7 +690,7 @@ class Runtime extends EventEmitter {
         }
         if (this._refreshTargets) this.emit(Runtime.TARGETS_UPDATE);
     }
-    
+
     /**
      * Get the number of threads in the given array that are monitor threads (threads
      * that update monitor values, and don't count as running a script).
@@ -864,17 +857,6 @@ class Runtime extends EventEmitter {
         this.emit(Runtime.VISUAL_REPORT, {id: blockId, value: String(value)});
     }
 
-    /**
-<<<<<<< HEAD
-     * Emit a sprite info report if the provided target is the original sprite
-     * @param {!Target} target Target to report sprite info for.
-     */
-    spriteInfoReport (target) {
-        if (!target.isOriginal) return;
-
-        this.emit(Runtime.SPRITE_INFO_REPORT, target.toJSON());
-    }
-
     /**
      * Add a monitor to the state. If the monitor already exists in the state,
      * overwrites it.
@@ -905,8 +887,6 @@ class Runtime extends EventEmitter {
     }
 
     /**
-=======
->>>>>>> develop
      * Get a target by its id.
      * @param {string} targetId Id of target to find.
      * @return {?Target} The target, if found.