From a6cc4297526a5a27fac47b7a138f13078a402030 Mon Sep 17 00:00:00 2001 From: Lysandros Nikolaou Date: Tue, 27 Oct 2020 21:29:41 +0200 Subject: [PATCH] Remove git conflict lines from test_parse_directory in peg_generator --- 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 100db1d424c7c9..6dfdbb9170e6e7 100755 --- a/Tools/peg_generator/scripts/test_parse_directory.py +++ b/Tools/peg_generator/scripts/test_parse_directory.py @@ -5,14 +5,9 @@ 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