Resolve merge conflict

This commit is contained in:
Hiroyasu Nishiyama
2022-12-27 23:45:25 +09:00
26 changed files with 549 additions and 324 deletions

View File

@@ -18,9 +18,9 @@
"dependencies": {
"@node-red/registry": "3.1.0-beta.0",
"@node-red/util": "3.1.0-beta.0",
"async-mutex": "0.3.2",
"async-mutex": "0.4.0",
"clone": "2.1.2",
"express": "4.18.1",
"express": "4.18.2",
"fs-extra": "10.1.0",
"json-stringify-safe": "5.0.1"
}