Projects >> webbit >>74d2d2b87704d003acacb34e4ca8fb5f897b938f

Chunk
Conflicting content
    public NettyHttpResponse(ChannelHandlerContext ctx,
                             HttpResponse response,
                             boolean isKeepAlive,
<<<<<<< HEAD
                             Thread.UncaughtExceptionHandler exceptionHandler)
    {
=======
                             Thread.UncaughtExceptionHandler exceptionHandler,
                             Thread.UncaughtExceptionHandler ioExceptionHandler) {
>>>>>>> 92c8b2896b3e09afe996278b9ce6f952b02c8c99
        this.ctx = ctx;
        this.response = response;
        this.isKeepAlive = isKeepAlive;
Solution content
    public NettyHttpResponse(ChannelHandlerContext ctx,
                             HttpResponse response,
                             boolean isKeepAlive,
                             Thread.UncaughtExceptionHandler exceptionHandler)
    {
        this.ctx = ctx;
        this.response = response;
        this.isKeepAlive = isKeepAlive;
File
NettyHttpResponse.java
Developer's decision
Version 1
Kind of conflict
Variable