Projects >> atlas >>cee41ee6563a220d3788dfc50861f3f736561835

Chunk
Conflicting content 
    }
    
    private EquivalenceUpdatingWorker equivUpdatingWorker() {
<<<<<<< HEAD
        return new EquivalenceUpdatingWorker(contentResolver, equivUpdater,
=======
        return new EquivalenceUpdatingWorker(contentResolver, lookupStore, equivUpdater,
>>>>>>> 69303c76db6a6636d608869e18919860243906b4
            Predicates.or(ImmutableList.>of(
                sourceIsIn(BBC_REDUX),
                Predicates.and(Predicates.instanceOf(Container.class),
Solution content 
    }
    
    private EquivalenceUpdatingWorker equivUpdatingWorker() {
        return new EquivalenceUpdatingWorker(contentResolver, lookupStore, equivUpdater,
            Predicates.or(ImmutableList.>of(
                sourceIsIn(BBC_REDUX),
                Predicates.and(Predicates.instanceOf(Container.class),
File
EquivTaskModule.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Return statement