| Chunk |
|---|
| Conflicting content |
|---|
// sort the list by display name
Collections.sort(list, new DisplayNameComparator());
<<<<<<< HEAD
=======
// limit the list to a maximum of 10 returned results
// TODO: make this limit configurable
if (list.size() > 10) {
list = list.subList(0, 9);
}
>>>>>>> e67c822afbf44063609085d3e0e0d4e0d791a71c
return list;
}
|
| Solution content |
|---|
// sort the list by display name
Collections.sort(list, new DisplayNameComparator());
// limit the list to a maximum of 10 returned results
// TODO: make this limit configurable
if (list.size() > 10) {
list = list.subList(0, 9);
}
return list;
}
|
| File |
|---|
| PersonLookupHelperImpl.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Comment |
| If statement |