Projects >> atlas >>a4998ae867e3832b30d725879b9a405ba3993634

Chunk
Conflicting content 
    public HttpResponse put(String arg0, Payload arg1) throws HttpException {
        throw new UnsupportedOperationException();
    }
<<<<<<< HEAD

=======
    
>>>>>>> 188e914ebdd3e6a51a84a07ddcc805024b80071f
    public HttpResponse delete(String string) throws HttpException {
        throw new UnsupportedOperationException();
    }
Solution content 
    public HttpResponse put(String arg0, Payload arg1) throws HttpException {
        throw new UnsupportedOperationException();
    }

    @Override
    public HttpResponse delete(String string) throws HttpException {
        throw new UnsupportedOperationException();
    }
File
FixedResponseHttpClient.java
Developer's decision
Manual
Kind of conflict
Blank