VimPlug/typeshed
1
0
Fork 0
mirror of https://github.com/davidhalter/typeshed.git synced 2025-12-09 21:46:42 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

overload fix

Browse Source
This commit is contained in:
Filip Hron
2016-03-03 10:10:45 +01:00
parent 0a11b5e898 d5cf02390f
commit fee8196459
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
stdlib/2.7/socket.pyi
View File

@@ -6,7 +6,11 @@
# see: http://nullege.com/codes/search/socket
# adapted for Python 2.7 by Michal Pokorny
<<<<<<< HEAD
from typing import Any, Tuple, List, Optional, Union, overload
=======
from typing import Any, Tuple, List, Optional, Union
>>>>>>> d5cf02390fa2a419a47d8ba7e5d34bf9252989ff
# ----- variables and constants -----