Merge branch 'dateutil' of https://github.com/jukebox/typeshed into dateutil

Conflicts:
	stdlib/3/argparse.pyi
	third_party/3/dateutil/parser.pyi

Author: jukebox

stdlib/3/argparse.pyi

@@ -128,7 +128,11 @@ class _ActionsContainer:
         help: str = ...,
         metavar: str = ...,
         dest: str = ...,
+<<<<<<< HEAD
         version: str = ...
+=======
+        version: str = ...,
+>>>>>>> 6bfccbb3edccdea60dfb267502fb2aec221d33b6
     ) -> None: ...
     def add_argument_group(self, *args, **kwargs): ...
     def add_mutually_exclusive_group(self, **kwargs): ...

third_party/3/dateutil/parser.pyi

@@ -32,7 +32,11 @@ class parser(object):
 
     def parse(
         self,
+<<<<<<< HEAD
         timestr: Union[str, bytes, IO[Any]],
+=======
+        timestr: str,
+>>>>>>> 6bfccbb3edccdea60dfb267502fb2aec221d33b6
         default: Optional[datetime],
         ignoretz: bool=...,
         tzinfos =...,