diff --git a/ui/app/pages/routes/index.js b/ui/app/pages/routes/index.js index 37c4dcbf4b5b..1c96eaf8ea95 100644 --- a/ui/app/pages/routes/index.js +++ b/ui/app/pages/routes/index.js @@ -292,13 +292,10 @@ class Routes extends Component { name = this.context.t('kovan') } else if (providerName === 'rinkeby') { name = this.context.t('rinkeby') -<<<<<<< HEAD } else if (providerName === 'localhost') { name = this.context.t('localhost') -======= } else if (providerName === 'goerli') { name = this.context.t('goerli') ->>>>>>> feature: add goerli support } else { name = this.context.t('unknownNetwork') }