misc: fix another mistake from the merge

This commit is contained in:
Pradyun Gedam 2017-11-12 20:03:19 +05:30
parent 945196e5f0
commit 1e614feee4
No known key found for this signature in database
GPG Key ID: DA17C4B29CB32E4B
1 changed files with 2 additions and 2 deletions

View File

@ -12,7 +12,7 @@ index 7232fe0f..6336a07d 100644
# preserved (requests.packages.urllib3.* is urllib3.*)
for mod in list(sys.modules):
diff --git a/pip/_vendor/requests/__init__.py b/pip/_vendor/requests/__init__.py
diff --git a/src/pip/_vendor/requests/__init__.py b/src/pip/_vendor/requests/__init__.py
index 9c3b769..36a4ef40 100644
--- a/src/pip/_vendor/requests/__init__.py
+++ b/src/pip/_vendor/requests/__init__.py
@ -34,7 +34,7 @@ index 9c3b769..36a4ef40 100644
+ pass
# urllib3's DependencyWarnings should be silenced.
diff --git a/pip/_vendor/requests/compat.py b/pip/_vendor/requests/compat.py
diff --git a/src/pip/_vendor/requests/compat.py b/src/pip/_vendor/requests/compat.py
index eb6530d..353ec29 100644
--- a/src/pip/_vendor/requests/compat.py
+++ b/src/pip/_vendor/requests/compat.py