Fix a merge mistake

Author: brettcannon

python/copilot/client.py

@@ -1101,17 +1101,9 @@ def on(
     def on(
         self,
         event_type_or_handler: SessionLifecycleEventType | SessionLifecycleHandler,
-<<<<<<<<< Temporary merge branch 1
         /,
-        handler: Optional[SessionLifecycleHandler] = None,
-    ) -> HandlerUnsubcribe:
-||||||||| f9144f1
-        handler: Optional[SessionLifecycleHandler] = None,
-    ) -> Callable[[], None]:
-=========
         handler: SessionLifecycleHandler | None = None,
     ) -> Callable[[], None]:
->>>>>>>>> Temporary merge branch 2
         """
         Subscribe to session lifecycle events.