Fix merge conflict

blink1073 · blink1073 · commit dd75e2778bc2 · 2015-01-05T20:39:41.000-06:00
diff --git a/lib/matplotlib/backends/backend_webagg_core.py b/lib/matplotlib/backends/backend_webagg_core.py
@@ -220,7 +220,6 @@ def handle_event(self, event):
                 self.leave_notify_event()
             elif e_type == 'scroll':
                 self.scroll_event(x, y, event['step'])
->>>>>>> 5c33faa... Add scroll event handling to webagg backend
         elif e_type in ('key_press', 'key_release'):
             key = event['key']
 
diff --git a/lib/matplotlib/backends/web_backend/mpl.js b/lib/matplotlib/backends/web_backend/mpl.js
@@ -125,7 +125,6 @@ mpl.figure.prototype._init_canvas = function() {
     // Throttle sequential mouse events to 1 every 20ms.
     rubberband.mousemove('motion_notify', mouse_event_fn);
 
-
     rubberband.mouseenter('figure_enter', mouse_event_fn);
     rubberband.mouseleave('figure_leave', mouse_event_fn);
 
