Projects >> maven-s3-wagon >>d3246a74cc8530791625b4d0118121aabf9f8985

Chunk
Conflicting content 
    }

    protected int getDivisor() {
<<<<<<< HEAD
        return getValue(DIVISOR_KEY, DEFAULT_DIVISOR);
=======
        return getValue(MAX_THREADS_KEY, DEFAULT_MAX_THREAD_COUNT);
>>>>>>> 918fd0cc6bf8376c31801324ab44af4ef3dbc556
    }

    protected int getValue(String key, int defaultValue) {
Solution content 
    }

    protected int getDivisor() {
        return getValue(DIVISOR_KEY, DEFAULT_DIVISOR);
    }

    protected int getValue(String key, int defaultValue) {
File
S3Wagon.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Return statement