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

This commit is contained in:
Lysandros Nikolaou 2020-10-28 00:37:36 +02:00 committed by GitHub
parent 2cb259fcf3
commit 8aee019d71
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 5 deletions

View File

@ -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