Tweak

diff --git a/README.md b/README.md
index 69bda6eeecb30ee33376c3056e420c5df843cee7..6f4e7cf629e7287e10f3d6fce5bf1144680a1f30 100644 (file)
--- 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**