Fix merge conflict

MetaMask · Apr 17, 2019 · 180f1b8 · 180f1b8
1 parent de0118c
commit 180f1b8
Showing 1 changed file with 0 additions and 3 deletions.
diff --git 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')
     }