Permalink
Browse files

merge2

  • Loading branch information...
1 parent e832482 commit 6fa8a38e8912459e079c2e75a3c44ee03c8d25b2 @indutny committed Jun 1, 2011
Showing with 0 additions and 5 deletions.
  1. +0 −5 EventEmitter2.js
View
@@ -305,13 +305,8 @@
// lets just kill any listeners associated with it.
//
var e = this._events[event];
-<<<<<<< HEAD
if (!removeEvents) {
-=======
-
- if(!removeEvents) {
->>>>>>> e3fa163ef9c0e5a03f781b271e9f7c216ad12c00
listeners.push(ns._listeners);
}
else {

0 comments on commit 6fa8a38

Please sign in to comment.