| Chunk |
|---|
| Conflicting content |
|---|
XBOX, PC, IOS, <<<<<<< HEAD BTVISION_CARDINAL, BTVISION_CLASSIC, ======= >>>>>>> 6cf0d823857a96a5e31a6cf86995d925c04116be YOUVIEW; |
| Solution content |
|---|
XBOX, PC, IOS, BTVISION_CARDINAL, BTVISION_CLASSIC, YOUVIEW; |
| File |
|---|
| Policy.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Enum value |
| Chunk |
|---|
| Conflicting content |
|---|
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),
<<<<<<< HEAD
PA_FEATURES("PA Features", "features.pressassociation.com", Countries.GB, SourceStatus.UNAVAILABLE),
BT("BT", "bt.com", Countries.GB, SourceStatus.UNAVAILABLE),
=======
YOUVIEW("YouView", "youview.com", Countries.GB, SourceStatus.UNAVAILABLE),
>>>>>>> 6cf0d823857a96a5e31a6cf86995d925c04116be
FACEBOOK("Facebook Graph API", "graph.facebook.com", Countries.ALL, SourceStatus.AVAILABLE_ENABLED);
private static final Splitter CSV_SPLITTER = Splitter.on(',').trimResults(); |
| Solution content |
|---|
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),
BT("BT", "bt.com", Countries.GB, SourceStatus.UNAVAILABLE),
YOUVIEW("YouView", "youview.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 |