aboutsummaryrefslogtreecommitdiff
path: root/node_modules/mixin-deep/index.js
diff options
context:
space:
mode:
Diffstat (limited to 'node_modules/mixin-deep/index.js')
-rw-r--r--node_modules/mixin-deep/index.js4
1 files changed, 4 insertions, 0 deletions
diff --git a/node_modules/mixin-deep/index.js b/node_modules/mixin-deep/index.js
index 60f704985..909fbef75 100644
--- a/node_modules/mixin-deep/index.js
+++ b/node_modules/mixin-deep/index.js
@@ -23,6 +23,10 @@ function mixinDeep(target, objects) {
*/
function copy(val, key) {
+ if (key === '__proto__') {
+ return;
+ }
+
var obj = this[key];
if (isObject(val) && isObject(obj)) {
mixinDeep(obj, val);