Projects >> SocialKit >>23888fc408a6fb7028be81808aaef03bb415a071

Chunk
Conflicting content 
        return mType;
    }

<<<<<<< HEAD
=======
    /**
     * Returns the parent feed that bounds this object.
     */
>>>>>>> 244cf3483a4c573245c51ae79cebc1cada11de32
    public DbFeed getContainingFeed() {
        DbFeed f = null;
        if (mFeedReference != null) {
Solution content 
        return mType;
    }

    /**
     * Returns the parent feed that bounds this object.
     */
    public DbFeed getContainingFeed() {
        DbFeed f = null;
        if (mFeedReference != null) {
File
DbObj.java
Developer's decision
Version 2
Kind of conflict
Comment