update

Author: NewUserHa

ipykernel/eventloops.py

@@ -461,8 +461,12 @@ def process_stream_events(shell_stream):
     if os.name=='nt':
         stop_event = asyncio.Event()
         t = None
+<<<<<<< HEAD
 
 >>>>>>> 29a00ff (update)
+=======
+
+>>>>>>> 9b557bc (update)
         def blocking_poll():
             poller = zmq.Poller()
             poller.register(shell_stream.socket, zmq.POLLIN)