removing git lines

timoniq · Jun 17, 2024 · afe3b69 · afe3b69
1 parent 5f5a599
commit afe3b69
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/telegrinder/bot/dispatch/waiter_machine/machine.py b/telegrinder/bot/dispatch/waiter_machine/machine.py
@@ -75,15 +75,12 @@ async def wait(
 
         api: ABCAPI
         key: Identificator
-<<<<<<< HEAD
         api, key = (
             linked
             if isinstance(linked, tuple)
             else (linked.ctx_api, state_view.get_state_key(linked))
         )  # type: ignore
-=======
         api, key = linked if isinstance(linked, tuple) else (linked.ctx_api, state_view.get_state_key(linked))  # type: ignore
->>>>>>> 9ae36b1 (exit_behaviour for waiter machine)
         if not key:
             raise RuntimeError("Unable to get state key.")