fix: Address merge conflict

MetaMask · Oct 28, 2024 · c968940 · c968940
1 parent d29ebc6
commit c968940
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/app/util/networks/customNetworks.tsx b/app/util/networks/customNetworks.tsx
@@ -133,10 +133,7 @@ export const UnpopularNetworkList = [
 export const CustomNetworkImgMapping: Record<`0x${string}`, string> = {
   '0xe': require('../../images/flare-mainnet.png'), // Flare Mainnet
   '0x13': require('../../images/songbird.png'), // Songbird Testnet
-<<<<<<< HEAD
   '0x8157': require('../../images/ape-network.png'), // ApeChain testnet
   '0x8173': require('../../images/ape-network.png'), // ApeChain mainnet
-=======
   '0x659': require('../../images/gravity.png'), // Gravity Alpha Mainnet
->>>>>>> main
 };