| Chunk |
|---|
| Conflicting content |
|---|
return;
} else if (reqPage > generator.size()) {
if (generator.size() == 1) {
<<<<<<< HEAD
Talker.problem("There is only 1 page.", sender);
} else {
=======
Talker.problem("There is only 1 page.");
else {
>>>>>>> c4ab55dd10d84618f78960445a091ee81277c540
Talker.problem("There are only " + generator.size() + " pages.", sender);
}
return; |
| Solution content |
|---|
return;
} else if (reqPage > generator.size()) {
if (generator.size() == 1) {
Talker.problem("There is only 1 page.", sender);
} else {
Talker.problem("There are only " + generator.size() + " pages.", sender);
}
return; |
| File |
|---|
| ListCmd.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method invocation |