From ebc073751851dfbb366eb453e78b145d4c9351d2 Mon Sep 17 00:00:00 2001 From: Pavel Karpy Date: Thu, 16 Jun 2022 16:41:34 +0300 Subject: [PATCH] [#240] lib: Remove merging artifacts Signed-off-by: Pavel Karpy --- robot/resources/lib/python_keywords/complex_object_actions.py | 1 - 1 file changed, 1 deletion(-) diff --git a/robot/resources/lib/python_keywords/complex_object_actions.py b/robot/resources/lib/python_keywords/complex_object_actions.py index f04e752a..7a06f12a 100644 --- a/robot/resources/lib/python_keywords/complex_object_actions.py +++ b/robot/resources/lib/python_keywords/complex_object_actions.py @@ -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): """