From 8ad07dcf1c0c3b24bc31086849b7305c7ab6070d Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 10 Feb 2008 04:54:25 +0000 Subject: [PATCH] Fix a mismerge svn path=/trunk/; revision=6489 --- gio/tests/data-output-stream.c | 1 - 1 file changed, 1 deletion(-) diff --git a/gio/tests/data-output-stream.c b/gio/tests/data-output-stream.c index 4917b6b..1a7e1ae 100644 --- 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" -- 2.7.4