Fix package.json conflict

This commit is contained in:
Nick O'Leary
2016-11-24 20:52:48 +00:00
23 changed files with 4989 additions and 76 deletions

View File

@@ -502,6 +502,9 @@
"null":"is null",
"nnull":"is not null",
"else":"otherwise"
},
"errors": {
"invalid-expr": "Invalid expression: __error__"
}
},
"change": {