From 518b5c722fd08f61b317acb9b64c1541548de4f1 Mon Sep 17 00:00:00 2001 From: jl777 Date: Sun, 18 Sep 2016 10:56:18 -0300 Subject: [PATCH] match --- iguana/coins/genbtc | 4 ---- 1 file changed, 4 deletions(-) diff --git a/iguana/coins/genbtc b/iguana/coins/genbtc index 1f69c6dde..42ceea975 100755 --- a/iguana/coins/genbtc +++ b/iguana/coins/genbtc @@ -1,5 +1 @@ -<<<<<<< HEAD -curl --url "http://127.0.0.1:7778" --data "{\"prefetchlag\":-1,\"poll\":1,\"active\":1,\"agent\":\"iguana\",\"method\":\"addcoin\",\"newcoin\":\"BTC\",\"startpend\":256,\"endpend\":256,\"services\":129,\"maxpeers\":512,\"RELAY\":1,\"VALIDATE\":1,\"portp2p\":8333}" -======= curl --url "http://127.0.0.1:7778" --data "{\"prefetchlag\":-1,\"poll\":1,\"active\":1,\"agent\":\"iguana\",\"method\":\"addcoin\",\"newcoin\":\"BTC\",\"startpend\":512,\"endpend\":512,\"services\":129,\"maxpeers\":512,\"RELAY\":1,\"VALIDATE\":1,\"portp2p\":8333}" ->>>>>>> master