| Chunk |
|---|
| Conflicting content |
|---|
else
{
throw new Exception(_("holdBook"));
<<<<<<< HEAD
=======
}
}
private boolean isAuthor(BookMeta bmeta, String player)
{
if (bmeta.getAuthor().equalsIgnoreCase(player))
{
return true;
>>>>>>> df1e4a228b5bbe6a960f77965483ea5f74d9664f
}
return false;
} |
| Solution content |
|---|
}
}
return bmeta.getAuthor().equalsIgnoreCase(player);
else
{
throw new Exception(_("holdBook"));
}
}
private boolean isAuthor(BookMeta bmeta, String player)
{ |
| File |
|---|
| Commandbook.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| If statement |
| Method signature |
| Return statement |