From afe3b6914fd3df8071f78c17425e8f3b9395f135 Mon Sep 17 00:00:00 2001 From: prostomarkeloff <28061158+prostomarkeloff@users.noreply.github.com> Date: Mon, 17 Jun 2024 15:30:06 +0300 Subject: [PATCH] removing git lines --- telegrinder/bot/dispatch/waiter_machine/machine.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/telegrinder/bot/dispatch/waiter_machine/machine.py b/telegrinder/bot/dispatch/waiter_machine/machine.py index dcda4412..3f7c9f51 100755 --- 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.")