| Chunk |
|---|
| Conflicting content |
|---|
.getMillis()
);
}
<<<<<<< HEAD
=======
>>>>>>> 31a61573345951c2f9e51e40ee383150ff6443ba
} |
| Solution content |
|---|
.getMillis()
);
}
} |
| File |
|---|
| TimestampParserTest.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Blank |