Fix a mismerge

svn path=/trunk/; revision=6489

diff --git a/gio/tests/data-output-stream.c b/gio/tests/data-output-stream.c
index 4917b6b7e074fe77269eb442dff414f5ed2ec813..1a7e1ae84c234d5dc38f75517b6398cd8d4f01e9 100644 (file)
--- a/gio/tests/data-output-stream.c
+++ b/gio/tests/data-output-stream.c
@@ -39,7 +39,6 @@ test_read_lines (GDataStreamNewlineType newline_type)
   char *lines;
   int size;
   int i;
-  int size;
 
 #define TEST_STRING    "some_text"