fix

Author: ammgws

Lib/subprocess.py

@@ -1694,7 +1694,6 @@ def _execute_child(self, args, executable, preexec_fn, close_fds,
                     # the ones in the handle_list
                     close_fds = False
 
-<<<<<<< HEAD
             if shell:
                 if not startupinfo.dwFlags & _winapi.STARTF_USESHOWWINDOW:
                     startupinfo.dwFlags |= _winapi.STARTF_USESHOWWINDOW