Projects >> twitter4j >>63bf15d15f2533480e43f6b96c44c8fbd593c7a1

Chunk
Conflicting content 
        }
<<<<<<< HEAD
            filterArray[i] = Integer.parseInt(filterSplit[i]);

        trackArray = track.split(",");
=======
>>>>>>> 64b00b1fe2f1556ddd1c415fa584b632edd188a0
    }

    private void printUsageAndExit() {
Solution content 
            filterArray[i] = Integer.parseInt(filterSplit[i]);

        }
        trackArray = track.split(",");
    }

    private void printUsageAndExit() {
File
PrintFilterStream.java
Developer's decision
Version 1
Kind of conflict
Attribute
Method invocation