Projects >> atlas >>3ed47be94db98fbe35b2169770ee864e9ab5818b

Chunk
Conflicting content 
        this.clock = clock;
    }

<<<<<<< HEAD
    @Override
    protected T setFields(T result, F inputContent) {
        super.setFields(result, inputContent);
        result.setPeople(transformPeople(inputContent.getPeople(), result.getPublisher()));
=======
    private T setContentFields(T result, Description inputContent) {
        result.setPeople(
                transformPeople(
                        inputContent.getPeople(),
                        this.getPublisher(inputContent.getPublisher()
                        )
                )
        );
>>>>>>> b7ca3e83821fe100950bb30cba0f05edd199e1e9
        result.setTopicRefs(topicRefs(inputContent.getTopics()));
        result.setKeyPhrases(keyPhrases(inputContent.getKeyPhrases(), inputContent.getPublisher()));
        result.setGenres(inputContent.getGenres());
Solution content 
        this.clock = clock;
    }

    @Override
    protected T setFields(T result, F inputContent) {
        super.setFields(result, inputContent);
        result.setPeople(transformPeople(inputContent.getPeople(), result.getPublisher()));
        result.setTopicRefs(topicRefs(inputContent.getTopics()));
        result.setKeyPhrases(keyPhrases(inputContent.getKeyPhrases(), inputContent.getPublisher()));
        result.setGenres(inputContent.getGenres());
File
ContentModelTransformer.java
Developer's decision
Version 1
Kind of conflict
Annotation
Method invocation
Method signature