[#240] lib: Remove merging artifacts

Signed-off-by: Pavel Karpy <carpawell@nspcc.ru>
This commit is contained in:
Pavel Karpy 2022-06-16 16:41:34 +03:00 committed by Stanislav Bogatyrev
parent a56734ed93
commit ebc0737518

View file

@ -24,7 +24,6 @@ ROBOT_AUTO_KEYWORDS = False
@keyword('Get Link Object')
<<<<<<< HEAD
def get_link_object(wallet: str, cid: str, oid: str, bearer_token: str = "",
wallet_config: str = WALLET_CONFIG):
"""