From 491ff47cf8ee05c2796f7be04e28efcc9b13d5ce Mon Sep 17 00:00:00 2001 From: Jonathan Rainville Date: Fri, 1 Jun 2018 13:35:52 -0400 Subject: [PATCH] conflict in en.json --- lib/i18n/locales/en.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/i18n/locales/en.json b/lib/i18n/locales/en.json index d97da559e..c8e8fb0b6 100644 --- a/lib/i18n/locales/en.json +++ b/lib/i18n/locales/en.json @@ -152,6 +152,9 @@ "Starting ipfs process": "Starting ipfs process", "ipfs process started": "ipfs process started", "Starting swarm process": "Starting swarm process", + "unknown command": "unknown command", + "Simulator not found; Please install it with \"%s\"": "Simulator not found; Please install it with \"%s\"", + "IMPORTANT: if you using a NodeJS version older than 6.9.1 then you need to install an older version of testrpc \"%s\"": "IMPORTANT: if you using a NodeJS version older than 6.9.1 then you need to install an older version of testrpc \"%s\"", "swarm process started": "swarm process started", "Storage process for swarm ended before the end of this process. Code: 12": "Storage process for swarm ended before the end of this process. Code: 12", "Storage process for swarm ended before the end of this process. Code: 1": "Storage process for swarm ended before the end of this process. Code: 1",