From 8aee019d71b9ed44107bdc8a0c9c132059c0e1ef Mon Sep 17 00:00:00 2001 From: Lysandros Nikolaou Date: Wed, 28 Oct 2020 00:37:36 +0200 Subject: [3.9] Remove git conflict lines from test_parse_directory in peg_generator (GH-23007) --- Tools/peg_generator/scripts/test_parse_directory.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/Tools/peg_generator/scripts/test_parse_directory.py b/Tools/peg_generator/scripts/test_parse_directory.py index 100db1d..6dfdbb9 100755 --- a/Tools/peg_generator/scripts/test_parse_directory.py +++ b/Tools/peg_generator/scripts/test_parse_directory.py @@ -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 -- cgit v0.12