re-fix merge of file nodes

2025-03-01 10:36:34 +00:00 · 2019-03-06 22:33:20 +00:00
parent dc89218702
commit b246f0779f
4 changed files with 2 additions and 4 deletions
--- 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"
        },
--- 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": "バイナリバッファ"
        },