Projects >> atlas-persistence >>f0ea5d991ee8dae88973344dc4bc2a7aa5935028

Chunk
Conflicting content 
        
        Set genres = ImmutableSet.of("Genre");
        DateTime dateTimeTest = DateTime.now();
<<<<<<< HEAD
        
=======

>>>>>>> e0ba73a2eb1d4f5d536adcb41a1d5878d433fedd
        Channel channel = Channel.builder()
            .withSource(Publisher.BBC)
            .withUri("uri")
Solution content 
        
        Set genres = ImmutableSet.of("Genre");
        DateTime dateTimeTest = DateTime.now();

        Channel channel = Channel.builder()
            .withSource(Publisher.BBC)
            .withUri("uri")
File
ChannelTranslatorTest.java
Developer's decision
Version 1
Kind of conflict
Blank
Chunk
Conflicting content 
        
        assertTrue(channel.hasValue());
        assertThat(channel.requireValue().getCanonicalUri(), is(equalTo("uri1")));
<<<<<<< HEAD
        assertThat(channel.requireValue().getAdvertiseFrom().toString(), is(equalTo(dateTime.toString())));
        
=======


        Maybe channel4 = store.fromId(channelId4);
        assertThat(channel4.requireValue().getAdvertiseFrom().toString(),
                            is(equalTo(dateTime.minusDays(1).toString())));
>>>>>>> e0ba73a2eb1d4f5d536adcb41a1d5878d433fedd
    }

    @Test
Solution content 
        
        assertTrue(channel.hasValue());
        assertThat(channel.requireValue().getCanonicalUri(), is(equalTo("uri1")));

        assertThat(channel.requireValue().getAdvertiseFrom().toString(), is(equalTo(dateTime.toString())));

    }

    @Test
File
MongoChannelStoreRetrievalTest.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable