Skip to content

Commit

Permalink
Fix merge issue from 86e653e
Browse files Browse the repository at this point in the history
  • Loading branch information
Scottmitch committed Jul 10, 2017
1 parent 86e653e commit 24263c2
Showing 1 changed file with 0 additions and 6 deletions.
6 changes: 0 additions & 6 deletions handler/src/main/java/io/netty/handler/ssl/SslHandler.java
Original file line number Diff line number Diff line change
Expand Up @@ -60,12 +60,6 @@
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;
import java.util.regex.Pattern;
import javax.net.ssl.SSLEngine;
import javax.net.ssl.SSLEngineResult;
import javax.net.ssl.SSLEngineResult.HandshakeStatus;
import javax.net.ssl.SSLEngineResult.Status;
import javax.net.ssl.SSLException;
import javax.net.ssl.SSLSession;

import javax.net.ssl.SSLEngine;
import javax.net.ssl.SSLEngineResult;
Expand Down

0 comments on commit 24263c2

Please sign in to comment.