diff options
Diffstat (limited to 'tests.merging/conflict-chunks.script')
| -rwxr-xr-x | tests.merging/conflict-chunks.script | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/tests.merging/conflict-chunks.script b/tests.merging/conflict-chunks.script index e5f6618d..5a0c5f52 100755 --- a/tests.merging/conflict-chunks.script +++ b/tests.merging/conflict-chunks.script @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2012 Codethink Limited +# Copyright (C) 2012-2013 Codethink Limited # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -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 |