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

[lysnikolaou]

https://github.com/python/cpython/commit/8aee019d71b9ed44107bdc8a0c9c132059c0e1ef
commit: 8aee019d71b9ed44107bdc8a0c9c132059c0e1ef
branch: 3.9
author: Lysandros Nikolaou <lisandrosnik at gmail.com>
committer: lysnikolaou <lisandrosnik at gmail.com>
date: 2020-10-28T00:37:36+02:00
summary:

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

files:
M Tools/peg_generator/scripts/test_parse_directory.py

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