Skip to content

Commit

Permalink
fixed merge issue
Browse files Browse the repository at this point in the history
  • Loading branch information
doug-martin committed Jan 13, 2013
1 parent 847a260 commit 5843f11
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
2 changes: 1 addition & 1 deletion extender-min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions extender.js
Expand Up @@ -472,10 +472,9 @@
if (typeof methods === "object") { if (typeof methods === "object") {
for (var j in methods) { for (var j in methods) {
if (methods.hasOwnProperty(j) && j !== "define" && j !== "extend" && j !== "expose") { if (methods.hasOwnProperty(j) && j !== "define" && j !== "extend" && j !== "expose") {
_extender[i] = methods[i]; _extender[j] = methods[j];
} }
} }
merge(_extender, arguments[i]);
} }
} }
return _extender; return _extender;
Expand Down

0 comments on commit 5843f11

Please sign in to comment.