| Chunk |
|---|
| Conflicting content |
|---|
{
private final Log logger = LogFactory.getLog(GetAllPersonAvatarId.class);
/**
<<<<<<< HEAD
* return a map of image identifiers and image blobs
=======
* reutrn a map of image identifiers and image blobs
>>>>>>> 64c4c966b8f6c3fe15e7c73db0e134c960d1063e
* {@inheritDoc}
* .
*/ |
| Solution content |
|---|
{
private final Log logger = LogFactory.getLog(GetAllPersonAvatarId.class);
/**
* return a map of image identifiers and image blobs
* {@inheritDoc}
* .
*/ |
| File |
|---|
| GetAllPersonAvatarId.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Comment |