Skip to content
Snippets Groups Projects
Commit cea99c2e authored by Mike Feranda's avatar Mike Feranda
Browse files

Merge branches '3078444' and '3078814' into 8.x-1.x

parents 31df9597 b025e1ce
No related branches found
No related tags found
No related merge requests found
......@@ -61,7 +61,7 @@
currMergedObj[key] = undefined;
}
// if object, then dive in / recurse.
if (typeof currObj2[key] === 'object') {
if (typeof currObj2[key] === 'object' && currObj2[key] !== null) {
// obj2 is nested and currMergedObj[key] is undefined, sync types.
if (!currMergedObj[key]) {
// obj2[key] ifArray.
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment