summaryrefslogtreecommitdiff
path: root/gitMergeCommon.py
diff options
context:
space:
mode:
Diffstat (limited to 'gitMergeCommon.py')
-rw-r--r--gitMergeCommon.py6
1 files changed, 0 insertions, 6 deletions
diff --git a/gitMergeCommon.py b/gitMergeCommon.py
index 3af4fbd..7e8855c 100644
--- a/gitMergeCommon.py
+++ b/gitMergeCommon.py
@@ -11,12 +11,6 @@ def printList(list, file=sys.stdout):
file.write(' ')
file.write('\n')
-if sys.version_info[0] < 2 or \
- (sys.version_info[0] == 2 and sys.version_info[1] < 4):
- die('Python version 2.4 required, found', \
- str(sys.version_info[0])+'.'+str(sys.version_info[1])+'.'+ \
- str(sys.version_info[2]))
-
import subprocess
# Debugging machinery