From: Lysandros Nikolaou <lisandrosnik@gmail.com>
Date: Tue, 27 Oct 2020 22:37:36 +0000 (+0200)
Subject: [3.9] Remove git conflict lines from test_parse_directory in peg_generator (GH-23007)
X-Git-Tag: v3.9.1rc1~89
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8aee019d71b9ed44107bdc8a0c9c132059c0e1ef;p=thirdparty%2FPython%2Fcpython.git

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

diff --git a/Tools/peg_generator/scripts/test_parse_directory.py b/Tools/peg_generator/scripts/test_parse_directory.py
index 100db1d424c7..6dfdbb9170e6 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