From d40509d6882da86ab86ba96e219fbabcafad22e4 Mon Sep 17 00:00:00 2001
From: rykerwilliams <rajahjames@gmail.com>
Date: Sun, 6 Oct 2013 16:41:27 -0400
Subject: [PATCH] Remove diff tool change.

---
 src/mixins/canvas_events.mixin.js | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/src/mixins/canvas_events.mixin.js b/src/mixins/canvas_events.mixin.js
index a4354143..4a810ddc 100644
--- a/src/mixins/canvas_events.mixin.js
+++ b/src/mixins/canvas_events.mixin.js
@@ -527,19 +527,6 @@
       target && target.fire('mousemove', { e: e });
     },
 
-<<<<<<< Updated upstream
-=======
-    /**
-     * Method that defines actions when a wheel event is detected.
-     *
-     * @param e Event object by Event.js
-     * @param self Event proxy object by Event.js
-     */
-    __onMouseWheel: function(e, self) {
-      this.fire('mouse:wheel', {e: e, self: self});
-    },
-
->>>>>>> Stashed changes
     /**
      * Sets the cursor depending on where the canvas is being hovered.
      * Note: very buggy in Opera