Fixes a bit of javadoc that was broken by a failed merge

2012-06-29 15:03:41 +10:00 · 2012-06-29 15:03:41 +10:00 · 7e35cc1ebb
commit 7e35cc1ebb
parent dc300f2c81
1 changed files with 3 additions and 5 deletions
--- a/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker.java
+++ b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker.java
@ -92,11 +92,9 @@ public abstract class WebSocketServerHandshaker {
    }

    /**
-<<<<<<< HEAD
-     * Returns the max length for any frame's payload.
-=======
-     * Returns the max length for any frame's payload
->>>>>>> abd10d9... Fixed bug where subprotocol not sent by client
+     * Gets the maximum length for any frame's payload.
+     *
+     * @return The maximum length for a frame's payload
     */
    public int getMaxFramePayloadLength() {
        return maxFramePayloadLength;