Fix a mismerge
authorMatthias Clasen <matthiasc@src.gnome.org>
Sun, 10 Feb 2008 04:54:25 +0000 (04:54 +0000)
committerMatthias Clasen <matthiasc@src.gnome.org>
Sun, 10 Feb 2008 04:54:25 +0000 (04:54 +0000)
commit8ad07dcf1c0c3b24bc31086849b7305c7ab6070d
treef21f1f821d64afbc34d8cb6d04ecaf955b345dd2
parent39edc34bb411d9d19e03b44538b4709df481dd4a
Fix a mismerge

svn path=/trunk/; revision=6489
gio/tests/data-output-stream.c