andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Cleanup javadocs

Browse Source 
Motivation:

Due some unclean merge we had merge messages in the javadocs

Modifications:

cleanup.

Result:

Correct javadoc.
This commit is contained in:
Norman Maurer 2016-08-15 16:25:51 +02:00
parent 0a3e6999c1
commit c08f1ee515
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
buffer/src/main/java/io/netty/buffer/ByteBufUtil.java
View File

@ -103,8 +103,6 @@ public final class ByteBufUtil {
}
/**
<<<<<<< HEAD
=======
* Returns a <a href="http://en.wikipedia.org/wiki/Hex_dump">hex dump</a>
* of the specified byte array.
*/
@ -121,7 +119,6 @@ public final class ByteBufUtil {
}
/**
>>>>>>> e5386b0... Move Hex dump related util from ByteBufUtil to inner class
* Calculates the hash code of the specified buffer. This method is
* useful when implementing a new buffer type.
*/