Skip to content

Commit 46d8dee

Browse files
committed
Fix networks.json
1 parent 1e8397b commit 46d8dee

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

networks.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
"address": "0x9E7Ae8Bdba9AA346739792d219a808884996Db67",
2424
"transactionHash": "0xe52d425fe34d6d5215ccfc9ddfa485d490b3018f0ee5bbed708f2d172044d60d"
2525
},
26-
<<<<<<< HEAD
2726
"137": {
2827
"address": "0x9E7Ae8Bdba9AA346739792d219a808884996Db67",
2928
"transactionHash": "0xd5d023a8df8fc2a94265b5da07bcb4d8f64d480988c75643358475c2f06e2c04"
@@ -47,11 +46,10 @@
4746
"59144": {
4847
"address": "0x9E7Ae8Bdba9AA346739792d219a808884996Db67",
4948
"transactionHash": "0xe90008f47c12768e9b1e104f03d33f795ba0d56df09320e66f629fe388a63706"
50-
=======
49+
},
5150
"9745": {
5251
"address": "0x9E7Ae8Bdba9AA346739792d219a808884996Db67",
5352
"transactionHash": "0xac21f1af0c6dd4e7f5ff935ade8aa9ae22d74b8d15f48028df3707ff05238287"
54-
>>>>>>> 8832f8c (Add plasma deployment files)
5553
}
5654
},
5755
"GPv2AllowListAuthentication_Proxy": {

0 commit comments

Comments
 (0)