Merge branch 'master' of https://github.com/dorkbox/mbassador

Conflicts: src/main/java/net/engio/mbassy/listener/MessageListener.java src/test/java/net/engio/mbassy/MetadataReaderTest.java
2015-02-08 00:27:47 +01:00 · 2015-02-08 00:27:47 +01:00 · 4fd1a95f20
commit 4fd1a95f20
parent f1d8ae0e6a 7f48f9eeed
1 changed files with 0 additions and 1 deletions
--- a/src/test/java/net/engio/mbassy/MetadataReaderTest.java
+++ b/src/test/java/net/engio/mbassy/MetadataReaderTest.java
@ -146,7 +146,6 @@ public class MetadataReaderTest extends AssertSupport {
        }
    }

-
    // a simple event listener
    @SuppressWarnings("unused")
    public class MessageListener1 {