From: Matthias Clasen <matthiasc@src.gnome.org>
Date: Sun, 10 Feb 2008 04:54:25 +0000 (+0000)
Subject: Fix a mismerge
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=8ad07dcf1c0c3b24bc31086849b7305c7ab6070d;p=dana%2Fcg-glib.git

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 4917b6b7..1a7e1ae8 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"