Projects >> realm-java >>d9abbd8a7569b755c74c597180f3ecedd36f638c

Chunk
Conflicting content 
     */
    public Table getTable(String name) {
        verifyGroupIsValid();
<<<<<<< HEAD
        if (name == null || name.equals("")) throw new IllegalArgumentException("Invalid name. Name must be a non-empty String.");
=======
        if (name == null || name.isEmpty()) {
            throw new IllegalArgumentException("Invalid name. Name must be a non-empty String.");
        }
>>>>>>> 5a6a6f4678a37b0657bd20792a038f341d318018
        if (immutable) {
            if (!hasTable(name)) {
                throwImmutable();
Solution content 
     */
    public Table getTable(String name) {
        verifyGroupIsValid();
        if (name == null || name.isEmpty()) {
            throw new IllegalArgumentException("Invalid name. Name must be a non-empty String.");
        }
        if (immutable) {
            if (!hasTable(name)) {
                throwImmutable();
File
Group.java
Developer's decision
Version 2
Kind of conflict
If statement