summaryrefslogtreecommitdiff
path: root/tests.merging/conflict-chunks.script
diff options
context:
space:
mode:
Diffstat (limited to 'tests.merging/conflict-chunks.script')
-rwxr-xr-xtests.merging/conflict-chunks.script3
1 files changed, 0 insertions, 3 deletions
diff --git a/tests.merging/conflict-chunks.script b/tests.merging/conflict-chunks.script
index e5f6618d..d5ed0507 100755
--- a/tests.merging/conflict-chunks.script
+++ b/tests.merging/conflict-chunks.script
@@ -21,9 +21,6 @@
set -eu
-# Disable test on versions of Python before 2.7.
-. "$SRCDIR/scripts/python-check"
-
. "$SRCDIR/scripts/setup-3rd-party-strata"
# Create stable branch to merge TO