| Chunk |
|---|
| Conflicting content |
|---|
"io.realm.RealmList",
"io.realm.RealmObject",
"java.util.Date",
<<<<<<< HEAD
=======
"java.util.Arrays",
>>>>>>> dab0f0d7dbd70ef291f1b6ad6a09ef2b4429a52a
packageName + ".*")
.emitEmptyLine();
|
| Solution content |
|---|
"io.realm.RealmList",
"io.realm.RealmObject",
"java.util.Date",
"java.util.Arrays",
packageName + ".*")
.emitEmptyLine();
|
| File |
|---|
| RealmSourceCodeGenerator.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Other |