From: Tom Christie <tom@tomchristie.com>
Date: Fri, 17 May 2019 12:15:39 +0000 (+0100)
Subject: Tweak
X-Git-Tag: 0.3.1~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f6a2aef13a63d405141ff97123f08efaf65c7d80;p=thirdparty%2Fhttpx.git

Tweak
---

diff --git a/README.md b/README.md
index 69bda6ee..6f4e7cf6 100644
--- a/README.md
+++ b/README.md
@@ -145,12 +145,8 @@ what gets sent over the wire.*
 >>> response = client.send(request)
 ```
 
-<<<<<<< HEAD
 * `def __init__(method, url, params, [content], [headers], [cookies])`
-=======
-* `def __init__(method, url, params, content, headers)`
->>>>>>> cookies
-* `.method` - **str** (Uppercased)
+* `.method` - **str**
 * `.url` - **URL**
 * `.content` - **byte** or **byte async iterator**
 * `.headers` - **Headers**