| Chunk |
|---|
| Conflicting content |
|---|
RDIO("rdio", "rdio.com",Countries.ALL, SourceStatus.UNAVAILABLE),
AMAZON_UK("Amazon UK", "amazon.co.uk", Countries.GB, SourceStatus.UNAVAILABLE),
BBC_RD_TOPIC("BBC R&D Live Topics", "live-topics.prototype0.net", Countries.GB, SourceStatus.UNAVAILABLE),
<<<<<<< HEAD
NETFLIX("Netflix", "gb.netflix.com", Countries.GB, SourceStatus.UNAVAILABLE),
=======
PA_FEATURES("PA Features", "features.pressassociation.com", Countries.GB, SourceStatus.UNAVAILABLE),
>>>>>>> 042710e2a906e8d524b316c01978d4485a993012
FACEBOOK("Facebook Graph API", "graph.facebook.com", Countries.ALL, SourceStatus.AVAILABLE_ENABLED);
private static final Splitter CSV_SPLITTER = Splitter.on(',').trimResults(); |
| Solution content |
|---|
RDIO("rdio", "rdio.com",Countries.ALL, SourceStatus.UNAVAILABLE),
AMAZON_UK("Amazon UK", "amazon.co.uk", Countries.GB, SourceStatus.UNAVAILABLE),
BBC_RD_TOPIC("BBC R&D Live Topics", "live-topics.prototype0.net", Countries.GB, SourceStatus.UNAVAILABLE),
NETFLIX("Netflix", "gb.netflix.com", Countries.GB, SourceStatus.UNAVAILABLE),
PA_FEATURES("PA Features", "features.pressassociation.com", Countries.GB, SourceStatus.UNAVAILABLE),
FACEBOOK("Facebook Graph API", "graph.facebook.com", Countries.ALL, SourceStatus.AVAILABLE_ENABLED);
private static final Splitter CSV_SPLITTER = Splitter.on(',').trimResults(); |
| File |
|---|
| Publisher.java |
| Developer's decision |
|---|
| Concatenation |
| Kind of conflict |
|---|
| Enum value |