Permalink
Browse files

Fixed broken merge

  • Loading branch information...
1 parent 806a49b commit e9300fd46a07f509d15657edc6d510ec64377b2d @SebastianZ SebastianZ committed Apr 2, 2014
Showing with 1 addition and 6 deletions.
  1. +1 −6 extension/content/firebug/dom/domMemberProvider.js
@@ -144,13 +144,8 @@ DOMMemberProvider.prototype =
{
add("userClass", userClasses);
}
-<<<<<<< Upstream, based on origin/master
- else if (!Firebug.showUserFuncs && Firebug.showInlineEventHandlers &&
- isInlineEventHandler)
-=======
else if (!Options.get("showUserFuncs") && Options.get("showInlineEventHandlers") &&
- Dom.isInlineEventHandler(name))
->>>>>>> 9621022 Issue 4536 (Cache options) http://code.google.com/p/fbug/issues/detail?id=4536
+ isInlineEventHandler)
{
add("userFunction", domHandlers);
}

0 comments on commit e9300fd

Please sign in to comment.