Skip to content
Browse files

fixed merge conflict

  • Loading branch information...
2 parents 9624c15 + 99fbb1e commit dd5db02ac30afce2e7c975b74c67beaf3caa7c5f @substack committed
Showing with 3 additions and 2 deletions.
  1. +1 −0 .gitignore
  2. +2 −2 index.js
View
1 .gitignore
@@ -0,0 +1 @@
+/node_modules/
View
4 index.js
@@ -184,9 +184,9 @@ function difflet (opts, prev, next) {
}
else write(node.inspect());
}
- else if (typeof node == 'object') {
+ else if (typeof node == 'object' && node !== null) {
var insertedKey = false;
- var deleted = insertable && prevNode && typeof prevNode === 'object'
+ var deleted = insertable && typeof prevNode === 'object' && prevNode
? Object.keys(prevNode).filter(function (key) {
return !Object.hasOwnProperty.call(node, key);
})

0 comments on commit dd5db02

Please sign in to comment.
Something went wrong with that request. Please try again.