diff options
| author | brunobar79 <brunobar79@gmail.com> | 2018-09-11 01:16:37 +0800 |
|---|---|---|
| committer | brunobar79 <brunobar79@gmail.com> | 2018-09-11 01:16:37 +0800 |
| commit | 26333ee83063f1c21fdabc63b9f20e0cc4a60181 (patch) | |
| tree | c82226c77eacbb1869fa6a1e8ed4d3d24e93029e /ui | |
| parent | a299641a95953f99e33b25fc7583c495b82c0322 (diff) | |
| parent | fdb023381be323bd3198d5e102447e6591e7e73e (diff) | |
| download | tangerine-wallet-browser-26333ee83063f1c21fdabc63b9f20e0cc4a60181.tar.gz tangerine-wallet-browser-26333ee83063f1c21fdabc63b9f20e0cc4a60181.tar.zst tangerine-wallet-browser-26333ee83063f1c21fdabc63b9f20e0cc4a60181.zip | |
fix merge conflicts
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/app/app.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/app/app.js b/ui/app/app.js index aa051280b..c93f93e75 100644 --- a/ui/app/app.js +++ b/ui/app/app.js @@ -188,7 +188,7 @@ class App extends Component { } else if (providerName === 'ropsten') { name = this.context.t('connectingToRopsten') } else if (providerName === 'kovan') { - name = this.context.t('connectingToRopsten') + name = this.context.t('connectingToKovan') } else if (providerName === 'rinkeby') { name = this.context.t('connectingToRinkeby') } else { |