test

8 years ago · a458241ec3
1 changed files with 0 additions and 4 deletions
--- a/iguana/coins/genbtc.json
+++ b/iguana/coins/genbtc.json
@ -1,5 +1 @@
-<<<<<<< HEAD
-{"numhelpers":4,"prefetchlag":-1,"poll":1,"active":1,"agent":"iguana","method":"addcoin","newcoin":"BTC","startpend":16,"endpend":16,"services":129,"maxpeers":512,"RELAY":1,"VALIDATE":1,"portp2p":8333}
-=======
 {"numhelpers":1,"prefetchlag":-1,"poll":1,"active":1,"agent":"iguana","method":"addcoin","newcoin":"BTC","startpend":64,"endpend":64,"services":129,"maxpeers":512,"RELAY":1,"VALIDATE":1,"portp2p":8333}
->>>>>>> master