Projects >> realm-java >>7afb7aeb11a7dd64fd33fdd03cf99cd2900e3d07

Chunk
Conflicting content 
    }

    /**
<<<<<<< HEAD
     * Handover this LinkView from one SharedGroup to another.
     *
     * @param senderSharedGroupPtr pointer to the sending SharedGroup.
     * @param receiverSharedGroupPtr pointer to the receiving SharedGroup.
     * @return The LinkView in the receiving SharedGroup.
     */
    public LinkView handover(long senderSharedGroupPtr, long receiverSharedGroupPtr) {
        // TODO
        return null;
=======
     * Remove all target rows pointed to by links in this link view, and clear this link view.
     */
    public void removeAllTargetRows() {
        checkImmutable();
        nativeRemoveAllTargetRows(nativePointer);
>>>>>>> befd34e67abacb8cf4c02a42f26cf21c3a59b76a
    }

    private void checkImmutable() {
Solution content 
    }

    /**
     * Handover this LinkView from one SharedGroup to another.
     *
     * @param senderSharedGroupPtr pointer to the sending SharedGroup.
     * @param receiverSharedGroupPtr pointer to the receiving SharedGroup.
     * @return The LinkView in the receiving SharedGroup.
     */
    public LinkView handover(long senderSharedGroupPtr, long receiverSharedGroupPtr) {
        // TODO
        return null;
    }

    /**
     * Remove all target rows pointed to by links in this link view, and clear this link view.
     */
    public void removeAllTargetRows() {
        checkImmutable();
        nativeRemoveAllTargetRows(nativePointer);
    }

    private void checkImmutable() {
File
LinkView.java
Developer's decision
Concatenation
Kind of conflict
Comment
Method invocation
Method signature
Return statement
Chunk
Conflicting content 
    public boolean equals(Object o) {
        return o instanceof RealmObservableFactory;
    }
<<<<<<< HEAD
=======

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

>>>>>>> befd34e67abacb8cf4c02a42f26cf21c3a59b76a
}
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