Merge branch 'fixes'

diff --git a/gitMergeCommon.py b/gitMergeCommon.py
index 3af4fbd1539dd9979575c71d3e9a5e37ac3b0868..7e8855c617ac3391a698e61023d9ca465b4b295e 100644 (file)
--- 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