Resolve merge conflict.

This commit is contained in:
Major-
2015-04-15 18:35:37 +01:00
parent f4c181c0f9
commit bae1f387fd
@@ -22,6 +22,7 @@ public final class MessageHandlerChainSet {
/**
* Notifies the appropriate {@link MessageHandlerChain} that a {@link Message} has been received.
*
* @param player The {@link Player} receiving the Message.
* @param message The Message.
* @return {@code true} if the Message propagated down the chain without being terminated or if the chain for the
* Message was not found, otherwise {@code false}.