Remove diff merge schmutz

2025-08-04 01:09:52 +08:00 · 2022-05-14 16:57:23 -04:00
parent a040439f48
commit b8cc1be32b
1 changed files with 0 additions and 1 deletions
--- a/pytest/test_grammar.py
+++ b/pytest/test_grammar.py
@@ -54,7 +54,6 @@ def test_grammar():
            expect_lhs.add("except_handler_else")

    expect_lhs.add("kwarg")
-<<<<<<< HEAD
    expect_lhs.add("load_genexpr")

    unused_rhs = unused_rhs.union(