Projects >> atlas-model >>2952fc3db2903488ef19de1ac6ce2153fb662f97

Chunk
Conflicting content
        return Iterables.concat(Iterables.transform(Iterables.concat(Iterables.transform(versions, Version.TO_ENCODINGS)), Encoding.TO_LOCATIONS));
    }

<<<<<<< HEAD
=======
    public ContainerSummary getContainerSummary() {
        return containerSummary;
    }

    public void setContainerSummary(ContainerSummary containerSummary) {
        this.containerSummary = containerSummary;
    }

>>>>>>> 3617bddb0ecd4064a11915de69e0b52b42facd5b
    @Override
    protected String getSortKey() {
        return SortKey.keyFrom(this);
Solution content
        return Iterables.concat(Iterables.transform(Iterables.concat(Iterables.transform(versions, Version.TO_ENCODINGS)), Encoding.TO_LOCATIONS));
    }

    public ContainerSummary getContainerSummary() {
        return containerSummary;
    }

    public void setContainerSummary(ContainerSummary containerSummary) {
        this.containerSummary = containerSummary;
    }

    @Override
    protected String getSortKey() {
        return SortKey.keyFrom(this);
File
Item.java
Developer's decision
Version 2
Kind of conflict
Method declaration