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