1
0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00

resolve merge conflicts

Co-Authored-By: legobeat <109787230+legobeat@users.noreply.github.com>
This commit is contained in:
PeterYinusa 2023-03-31 12:29:20 +01:00
parent 346aa12470
commit 87e8521f9c

View File

@ -290,12 +290,6 @@ export const BUILT_IN_NETWORKS = {
ticker: TEST_NETWORK_TICKER_MAP[NETWORK_TYPES.LINEA_TESTNET],
blockExplorerUrl: 'https://explorer.goerli.linea.build',
},
[NETWORK_TYPES.LINEA_TESTNET]: {
networkId: NETWORK_IDS.LINEA_TESTNET,
chainId: CHAIN_IDS.LINEA_TESTNET,
ticker: TEST_NETWORK_TICKER_MAP[NETWORK_TYPES.LINEA_TESTNET],
blockExplorerUrl: 'https://explorer.goerli.linea.build',
},
[NETWORK_TYPES.MAINNET]: {
networkId: NETWORK_IDS.MAINNET,
chainId: CHAIN_IDS.MAINNET,