Projects >> atlas-client >>90742939aacfcecf4a05277b04ab687f5ba0c5f2

Chunk
Conflicting content
    private final Set annotations;
    private final Optional selection;
    
<<<<<<< HEAD
    private ContentQuery(Iterable uris, Iterable ids, Iterable annotations) {
        checkArgument(Iterables.isEmpty(uris) ^ Iterables.isEmpty(ids));
=======
    private ContentQuery(Iterable uris, Iterable ids, Iterable annotations, Optional selection) {
>>>>>>> 5c7eabcc601a18039766bad4fc2496953a982779
        this.uris = ImmutableSet.copyOf(uris);
        this.ids = ImmutableSet.copyOf(ids);
        this.annotations = ImmutableSet.copyOf(annotations);
Solution content
    private final Set annotations;
    private final Optional selection;
    
    private ContentQuery(Iterable uris, Iterable ids, Iterable annotations, Optional selection) {
        checkArgument(Iterables.isEmpty(uris) ^ Iterables.isEmpty(ids));
        this.uris = ImmutableSet.copyOf(uris);
        this.ids = ImmutableSet.copyOf(ids);
        this.annotations = ImmutableSet.copyOf(annotations);
File
ContentQuery.java
Developer's decision
Combination
Kind of conflict
Method invocation
Method signature