Skip to content

Commit 8aee019

Browse files
authored
[3.9] Remove git conflict lines from test_parse_directory in peg_generator (GH-23007)
1 parent 2cb259f commit 8aee019

File tree

1 file changed

+0
-5
lines changed

1 file changed

+0
-5
lines changed

Tools/peg_generator/scripts/test_parse_directory.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,9 @@
55
import os
66
import sys
77
import time
8-
import traceback
98
import tokenize
10-
<<<<<<< HEAD
119
import _peg_parser
12-
from glob import glob
13-
=======
1410
from glob import glob, escape
15-
>>>>>>> 9355868458... bpo-41043: Escape literal part of the path for glob(). (GH-20994)
1611
from pathlib import PurePath
1712

1813
from typing import List, Optional, Any, Tuple

0 commit comments

Comments
 (0)