| Chunk |
|---|
| Conflicting content |
|---|
logger.debug("\ntestFindOneThumnail_Tistory-------------------------------------------------------------------------------------");
}
<<<<<<< HEAD
}
=======
}
>>>>>>> 449cc4b5cc461458d191b111e1d8791b81de5891 |
| Solution content |
|---|
logger.debug("\ntestFindOneThumnail_Tistory-------------------------------------------------------------------------------------");
}
} |
| File |
|---|
| SummarykServiceTest.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Other |