summaryrefslogtreecommitdiff
path: root/tests3/data/duplicate-merge-key.former-loader-error.data
diff options
context:
space:
mode:
authorxi <xi@18f92427-320e-0410-9341-c67f048884a3>2008-12-29 17:24:05 +0000
committerxi <xi@18f92427-320e-0410-9341-c67f048884a3>2008-12-29 17:24:05 +0000
commit0dfeb9f5f403658a12a0305d1cf2ff54ccb88f20 (patch)
tree9f53c734a8aaa6305ebcbb526a990f207d978302 /tests3/data/duplicate-merge-key.former-loader-error.data
parent26fa005de84c1a760ed94a80866ddb1d6eb74f3c (diff)
downloadpyyaml-0dfeb9f5f403658a12a0305d1cf2ff54ccb88f20.tar.gz
Added basic support for Python 3 (Thanks idadesub(at)users(dot)sourceforge(dot)net).
git-svn-id: http://svn.pyyaml.org/pyyaml/trunk@328 18f92427-320e-0410-9341-c67f048884a3
Diffstat (limited to 'tests3/data/duplicate-merge-key.former-loader-error.data')
-rw-r--r--tests3/data/duplicate-merge-key.former-loader-error.data4
1 files changed, 4 insertions, 0 deletions
diff --git a/tests3/data/duplicate-merge-key.former-loader-error.data b/tests3/data/duplicate-merge-key.former-loader-error.data
new file mode 100644
index 0000000..cebc3a1
--- /dev/null
+++ b/tests3/data/duplicate-merge-key.former-loader-error.data
@@ -0,0 +1,4 @@
+---
+<<: {x: 1, y: 2}
+foo: bar
+<<: {z: 3, t: 4}