| Chunk |
|---|
| Conflicting content |
|---|
"number",
"emails"
};
<<<<<<< HEAD
=======
>>>>>>> 0cab2550511aa5882549b1b0ddfb6c9bb0b6ffcc
protected static final int NAME_COLUMN = 0;
protected static final int NUMBER_COLUMN = 1; |
| Solution content |
|---|
"number",
"emails"
};
protected static final int NAME_COLUMN = 0;
protected static final int NUMBER_COLUMN = 1; |
| File |
|---|
| ADNList.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Blank |