[3.9] Remove git conflict lines from test_parse_directory in peg_generator (GH-23007)
This commit is contained in:
parent
2cb259fcf3
commit
8aee019d71
|
@ -5,14 +5,9 @@ import ast
|
|||
import os
|
||||
import sys
|
||||
import time
|
||||
import traceback
|
||||
import tokenize
|
||||
<<<<<<< HEAD
|
||||
import _peg_parser
|
||||
from glob import glob
|
||||
=======
|
||||
from glob import glob, escape
|
||||
>>>>>>> 9355868458... bpo-41043: Escape literal part of the path for glob(). (GH-20994)
|
||||
from pathlib import PurePath
|
||||
|
||||
from typing import List, Optional, Any, Tuple
|
||||
|
|
Loading…
Reference in New Issue