Projects >> atlas-feeds >>322645f9af8ee66217862420608efdd46b0398a4

Chunk
Conflicting content 
import com.google.common.base.Joiner;
import com.google.common.base.Strings;
<<<<<<< HEAD
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Iterables;
import com.google.common.collect.Sets;
=======
import com.google.common.collect.Ordering;
>>>>>>> 14bdcf3480e66f1e19841c73d0d217e0e3866cff
import com.metabroadcast.common.time.DateTimeZones;

public class RadioPlayerProgrammeInformationOutputter extends RadioPlayerXMLOutputter {
Solution content 
import com.google.common.base.Strings;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Ordering;
import com.google.common.collect.Sets;
import com.metabroadcast.common.time.DateTimeZones;

public class RadioPlayerProgrammeInformationOutputter extends RadioPlayerXMLOutputter {
File
RadioPlayerProgrammeInformationOutputter.java
Developer's decision
Combination
Kind of conflict
Import