From b246f0779f2bd17ea828f0299cc849d39c619f94 Mon Sep 17 00:00:00 2001
From: Dave Conway-Jones <conway@uk.ibm.com>
Date: Wed, 6 Mar 2019 22:33:20 +0000
Subject: [PATCH] re-fix merge of file nodes

---
 package.json                                                    | 2 +-
 .../node_modules/@node-red/nodes/locales/en-US/messages.json    | 1 -
 packages/node_modules/@node-red/nodes/locales/ja/messages.json  | 1 -
 packages/node_modules/@node-red/nodes/package.json              | 2 +-
 4 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index e2a65eb07..e024fdce2 100644
--- a/package.json
+++ b/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"
     },
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/messages.json b/packages/node_modules/@node-red/nodes/locales/en-US/messages.json
index 1245dd8ce..d18708e41 100755
--- a/packages/node_modules/@node-red/nodes/locales/en-US/messages.json
+++ b/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"
         },
diff --git a/packages/node_modules/@node-red/nodes/locales/ja/messages.json b/packages/node_modules/@node-red/nodes/locales/ja/messages.json
index 7cf8ab781..82b622b06 100755
--- a/packages/node_modules/@node-red/nodes/locales/ja/messages.json
+++ b/packages/node_modules/@node-red/nodes/locales/ja/messages.json
@@ -858,7 +858,6 @@
             "filelabel": "file",
             "sendError": "エラーメッセージを送信(互換モード)",
             "deletelabel": "delete __file__",
-            "encoding": "エンコーディング"
             "utf8String": "UTF8文字列",
             "binaryBuffer": "バイナリバッファ"
         },
diff --git a/packages/node_modules/@node-red/nodes/package.json b/packages/node_modules/@node-red/nodes/package.json
index 810a021e5..fa946567c 100644
--- a/packages/node_modules/@node-red/nodes/package.json
+++ b/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"
     }