re-fix merge of file nodes

package.json

@@ -69,7 +69,7 @@
         "semver": "5.6.0",
         "uglify-js": "3.4.9",
         "when": "3.7.8",
-        "ws": "6.1.3",
+        "ws": "6.1.4",
         "xml2js": "0.4.19",
         "iconv-lite": "0.4.24"
     },

packages/node_modules/@node-red/nodes/locales/en-US/messages.json

@@ -860,7 +860,6 @@
             "filelabel": "file",
             "sendError": "Send message on error (legacy mode)",
             "deletelabel": "delete __file__",
-            "encoding": "Encoding"
             "utf8String": "UTF8 string",
             "binaryBuffer": "binary buffer"
         },

packages/node_modules/@node-red/nodes/locales/ja/messages.json

@@ -858,7 +858,6 @@
             "filelabel": "file",
             "sendError": "エラーメッセージを送信(互換モード)",
             "deletelabel": "delete __file__",
-            "encoding": "エンコーディング"
             "utf8String": "UTF8文字列",
             "binaryBuffer": "バイナリバッファ"
         },

packages/node_modules/@node-red/nodes/package.json

@@ -36,7 +36,7 @@
         "on-headers": "1.0.2",
         "raw-body": "2.3.3",
         "request": "2.88.0",
-        "ws": "6.1.3",
+        "ws": "6.1.4",
         "xml2js": "0.4.19",
         "iconv-lite": "0.4.24"
     }