Projects >> gitools >>83ff0a1f27aac7ef2f9dbcaf7ddea9456b9b1f85

Chunk
Conflicting content 
        return new OrPredicate<>(predicates);
    }

<<<<<<< HEAD
    public static  IMatrixPredicate or(Iterable> predicates) {
        return new OrPredicate<>(predicates);
    }

=======
>>>>>>> f1c068fa4ed133d2f6f7ec4059d3a86fa0293f88
    enum ObjectPredicate implements IMatrixPredicate {
        ALWAYS_TRUE {
            @Override
Solution content 
        return new OrPredicate<>(predicates);
    }

    public static  IMatrixPredicate or(Iterable> predicates) {
        return new OrPredicate<>(predicates);
    }

    enum ObjectPredicate implements IMatrixPredicate {
        ALWAYS_TRUE {
            @Override
File
MatrixPredicates.java
Developer's decision
Version 1
Kind of conflict
Method declaration
Chunk
Conflicting content 
    public static class OrPredicate implements IMatrixPredicate {

<<<<<<< HEAD
        private Iterable> innerPredicates;

        public OrPredicate(IMatrixPredicate[] innerPredicates) {
            this.innerPredicates = Arrays.asList(innerPredicates);
        }

        public OrPredicate(Iterable> innerPredicates) {
=======
        private IMatrixPredicate[] innerPredicates;

        public OrPredicate(IMatrixPredicate[] innerPredicates) {
>>>>>>> f1c068fa4ed133d2f6f7ec4059d3a86fa0293f88
            this.innerPredicates = innerPredicates;
        }
Solution content 
    public static class OrPredicate implements IMatrixPredicate {

        private Iterable> innerPredicates;

        public OrPredicate(IMatrixPredicate[] innerPredicates) {
            this.innerPredicates = Arrays.asList(innerPredicates);
        }

        public OrPredicate(Iterable> innerPredicates) {
            this.innerPredicates = innerPredicates;
        }
File
MatrixPredicates.java
Developer's decision
Version 1
Kind of conflict
Attribute
Method declaration
Method signature