summaryrefslogtreecommitdiff
path: root/_test/data/merge.detect
diff options
context:
space:
mode:
authorAnthon van der Neut <anthon@mnt.org>2016-01-22 21:22:33 +0100
committerAnthon van der Neut <anthon@mnt.org>2016-01-22 21:22:33 +0100
commitda73c8aa0d8db3d0f54d88740a0f7f621ac563df (patch)
tree7cbbfec9780ab9a33f09926e91cab343be049cdb /_test/data/merge.detect
parenta5f03a5e66daaea85af2730fa961d11c62d8cf17 (diff)
downloadruamel.yaml-da73c8aa0d8db3d0f54d88740a0f7f621ac563df.tar.gz
moved test to _test to prevent setuptools from including test/test_*.py0.10.17
although the package dirs were explicitly specified. This used to lead to half included, non-working test directory contents that have no place in a distribution. This fixes issue #17
Diffstat (limited to '_test/data/merge.detect')
-rw-r--r--_test/data/merge.detect1
1 files changed, 1 insertions, 0 deletions
diff --git a/_test/data/merge.detect b/_test/data/merge.detect
new file mode 100644
index 0000000..1672d0d
--- /dev/null
+++ b/_test/data/merge.detect
@@ -0,0 +1 @@
+tag:yaml.org,2002:merge