Projects >> realm-java >>77818a7dc83e501849645701ef2751499ce4aed7

Chunk
Conflicting content 
    public boolean equals(Object o) {
        return o instanceof RealmObservableFactory;
    }
<<<<<<< HEAD
}
=======

    @Override
    public int hashCode() {
        return 37;
    }

}
>>>>>>> 2eb0fbcbd8104b88b0dfcc71497578337a8dea4a
Solution content 
    public boolean equals(Object o) {
        return o instanceof RealmObservableFactory;
    }
    @Override
    public int hashCode() {
        return 37;
    }

}
File
RealmObservableFactory.java
Developer's decision
Version 2
Kind of conflict
Annotation
Method declaration