Skip to content

Commit

Permalink
Revert "Merge pull request #32 from greelgorke/master"
Browse files Browse the repository at this point in the history
This reverts commit 273ab44, reversing
changes made to 2f3efa2.
  • Loading branch information
ljharb committed Jul 19, 2018
1 parent 8d106d2 commit 92f406d
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 4 deletions.
3 changes: 2 additions & 1 deletion .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,11 @@
"eqeqeq": [2, "allow-null"],
"func-name-matching": [1],
"max-depth": [1, 4],
"max-statements": [2, 26],
"max-statements": [2, 27],
"no-extra-parens": [1],
"no-magic-numbers": [0],
"no-restricted-syntax": [2, "BreakStatement", "ContinueStatement", "DebuggerStatement", "LabeledStatement", "WithStatement"],
"sort-keys": [0],
"strict": [0],
}
}
2 changes: 1 addition & 1 deletion .jscs.json
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,6 @@

"requireSpacesInsideImportedObjectBraces": true,

"requireUseStrict": true
"requireUseStrict": false
}

6 changes: 4 additions & 2 deletions index.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
'use strict';

var hasOwn = Object.prototype.hasOwnProperty;
var toStr = Object.prototype.toString;
var defineProperty = Object.defineProperty;
Expand All @@ -14,6 +12,8 @@ var isArray = function isArray(arr) {
};

var isPlainObject = function isPlainObject(obj) {
'use strict';

if (!obj || toStr.call(obj) !== '[object Object]') {
return false;
}
Expand Down Expand Up @@ -63,6 +63,8 @@ var getProperty = function getProperty(obj, name) {
};

module.exports = function extend() {
'use strict';

var options, name, src, copy, copyIsArray, clone;
var target = arguments[0];
var i = 1;
Expand Down

0 comments on commit 92f406d

Please sign in to comment.