Projects >> ParandroidMessaging >>3643ac18361ebb2c6194569ac7ee2f0927155f07

Chunk
Conflicting content 
        }
        
        return mSlides.get(location);
    }

    public SlideModel get(int location) {
<<<<<<< HEAD
        return (location >= 0 && location < mSlides.size()) ? mSlides.get(location) : null;
=======
        if (mSlides.size() == 0) {
            return null;
>>>>>>> 5b783617de51ff66a90342cb304cd24d079b7c5f
    }

    public int indexOf(Object object) {
Solution content 
    }

    public SlideModel get(int location) {
        return (location >= 0 && location < mSlides.size()) ? mSlides.get(location) : null;
    }

    public int indexOf(Object object) {
File
SlideshowModel.java
Developer's decision
Version 1
Kind of conflict
If statement
Method invocation
Return statement
Variable