Projects >> atlas >>2746e53723fc6abf3d2d81ae79e164cd9ba6a229

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

    @Override
>>>>>>> 7c2ccae3a1c15075b98a80be0814eb17920d9c84
    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
Version 2
Kind of conflict
Annotation