| Chunk |
|---|
| Conflicting content |
|---|
}
if (useSimpleNotice) {
<<<<<<< HEAD
player.sendPluginMessage(plugin, "SimpleNotice", ChatMessage.getBytes());
=======
player.sendPluginMessage(plugin, "SimpleNotice", message.getBytes());
>>>>>>> 06451c565a5e1c862978bb31a045a2f6573f957f
} else {
player.sendMessage(ChatMessage);
} |
| Solution content |
|---|
}
if (useSimpleNotice) {
player.sendPluginMessage(plugin, "SimpleNotice", ChatMessage.getBytes());
} else {
player.sendMessage(ChatMessage);
} |
| File |
|---|
| MessageScheduler.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method invocation |