Removed a merge leftover

javiereguiluz · javiereguiluz · commit 66b8ee2ceeef · 2020-06-30T10:43:02.000+02:00
diff --git a/http_client.rst b/http_client.rst
@@ -319,7 +319,6 @@ autoconfigure the HTTP client based on the requested URL:
                 ],
             ],
         ]);
->>>>>>> 5.0:http_client.rst
 
     .. code-block:: php-standalone
 
