methods/http.cc: remove merge artifact
authorMichael Vogt <michael.vogt@ubuntu.com>
Thu, 30 Jul 2009 16:25:16 +0000 (18:25 +0200)
committerMichael Vogt <michael.vogt@ubuntu.com>
Thu, 30 Jul 2009 16:25:16 +0000 (18:25 +0200)
commit056539eeb8eb84cea65c0c15466111b978ee156d
tree354f2bcc2a4883e44a7c36cc670577fd641252a2
parent55fb35e87a1ff550cbb3010c5a03064f0a2b10be
methods/http.cc: remove merge artifact
methods/http.cc