Projects >> jedis >>90dd6a1068185068528da1f0894ce28f8a1f380c

Chunk
Conflicting content 
        this(poolConfig, host, Protocol.DEFAULT_PORT, Protocol.DEFAULT_TIMEOUT, null, Protocol.DEFAULT_DATABASE);
    }

<<<<<<< HEAD
    public JedisPool(String host, int port) {
        this(new Config(), host, port, Protocol.DEFAULT_TIMEOUT, null, Protocol.DEFAULT_DATABASE);
=======
    public JedisPool(final String host, final int port) {
        super(new Config(), new JedisFactory(host, port,
                Protocol.DEFAULT_TIMEOUT, null));
>>>>>>> e9644a45291302d797ce769d51082fb52726a19a
    }

    public JedisPool(final String host) {
Solution content 
        this(poolConfig, host, Protocol.DEFAULT_PORT, Protocol.DEFAULT_TIMEOUT, null, Protocol.DEFAULT_DATABASE);
    }

    public JedisPool(String host, int port) {
        this(new Config(), host, port, Protocol.DEFAULT_TIMEOUT, null, Protocol.DEFAULT_DATABASE);
    }

    public JedisPool(final String host) {
File
JedisPool.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Method signature