Merge hell

This commit is contained in:
rocky
2021-10-26 06:42:23 -04:00
parent 8aeb0aad8c
commit 5390e3b838
5 changed files with 13 additions and 14 deletions

View File

@@ -75,9 +75,7 @@ def main_bin():
(3, 4), (3, 5), (3, 6),
(3, 7), (3, 8), (3, 9), (3, 10)
)):
print('Error: %s requires Python 2.4-3.10' % program,
file=sys.stderr)
>>>>>>> python-3.3-to-3.5
print('Error: %s requires Python 2.4-3.10' % program)
sys.exit(-1)
do_verify = recurse_dirs = False