Projects >> BitcoinJ >>8d844a3580a4086c917694ac25736c73a1952eb5

Chunk
Conflicting content
        // Connect to the localhost node. One minute timeout since we won't try any other peers
        System.out.println("Connecting ...");
<<<<<<< HEAD
        NetworkConnection conn = new NetworkConnection(InetAddress.getByName("plan99.net"), params,
                                                       blockStore.getChainHead().getHeight(), 60000);
=======
>>>>>>> 2bf71678b7bebb2cd3ebe969adbe075eff6678ad
        BlockChain chain = new BlockChain(params, wallet, blockStore);
        
        final PeerGroup peerGroup = new PeerGroup(blockStore, params, chain);
Solution content
        // Connect to the localhost node. One minute timeout since we won't try any other peers
        System.out.println("Connecting ...");
        BlockChain chain = new BlockChain(params, wallet, blockStore);
        
        final PeerGroup peerGroup = new PeerGroup(blockStore, params, chain);
File
PingService.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Variable