[3.9] Remove git conflict lines from test_parse_directory in peg_generator (GH-23007)

1 file changed