From 76149b07d21ea94c627191748b35adf6ac011728 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <javier.jardon@codethink.co.uk>
Date: Fri, 18 Jan 2013 18:20:08 +0000
Subject: tests.merging/*: Remove check to run only the teset with Python 2.7

As we use ordererdict for python < 2.7 as well
See 37f8d84d7ab356169bf7c04bdecb39a61b85c88d
---
 tests.merging/conflict-stratum-field-ordering.script | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'tests.merging/conflict-stratum-field-ordering.script')

diff --git a/tests.merging/conflict-stratum-field-ordering.script b/tests.merging/conflict-stratum-field-ordering.script
index f5bfb4b8..00bc551a 100755
--- a/tests.merging/conflict-stratum-field-ordering.script
+++ b/tests.merging/conflict-stratum-field-ordering.script
@@ -26,9 +26,6 @@
 
 set -eu
 
-# Disable test on versions of Python before 2.7.
-. "$SRCDIR/scripts/python-check"
-
 cd "$DATADIR/workspace"
 "$SRCDIR/scripts/test-morph" init
 
-- 
cgit v1.2.1