diff options
Diffstat (limited to 'astroid/protocols.py')
| -rw-r--r-- | astroid/protocols.py | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/astroid/protocols.py b/astroid/protocols.py index 72f78984..071b3970 100644 --- a/astroid/protocols.py +++ b/astroid/protocols.py @@ -455,13 +455,7 @@ def with_assigned_stmts(self, node, context=None, asspath=None): yield obj -<<<<<<< variant A -nodes.With.assigned_stmts = raise_if_nothing_inferred(with_assigned_stmts) ->>>>>>> variant B nodes.With.assigned_stmts = with_assigned_stmts -####### Ancestor -nodes.With.assigned_stmts = raise_if_nothing_infered(with_assigned_stmts) -======= end @bases.yes_if_nothing_inferred |