Skip to content

Commit

Permalink
TehShrike#185 remove accidental indentation
Browse files Browse the repository at this point in the history
  • Loading branch information
Hafsteinn-Ingason-Tidal committed Oct 6, 2020
1 parent 0b23f28 commit 3d84fb1
Showing 1 changed file with 8 additions and 9 deletions.
17 changes: 8 additions & 9 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -59,16 +59,15 @@ function mergeObject(target, source, options) {
})
}
getKeys(source).forEach(function(key) {
if (propertyIsUnsafe(target, key)) {
return
}

if (propertyIsOnObject(target, key) && options.isMergeableObject(source[key])) {
destination[key] = getMergeFunction(key, options, target[key], source[key])(target[key], source[key], options);
} else
destination[key] = cloneUnlessOtherwiseSpecified(source[key], options);
if (propertyIsUnsafe(target, key)) {
return
}
);

if (propertyIsOnObject(target, key) && options.isMergeableObject(source[key])) {
destination[key] = getMergeFunction(key, options, target[key], source[key])(target[key], source[key], options);
} else
destination[key] = cloneUnlessOtherwiseSpecified(source[key], options);
});
return destination
}

Expand Down

0 comments on commit 3d84fb1

Please sign in to comment.