From 73a6d43a66a828b09e2c1b5a483405e6e0b5fa6a Mon Sep 17 00:00:00 2001
From: JP Rosevear <jpr@src.gnome.org>
Date: Thu, 24 Aug 2000 20:12:06 +0000
Subject: Fix minor conflicts.

svn path=/trunk/; revision=5017
---
 libical/src/test/icaltestparser.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'libical/src/test/icaltestparser.c')

diff --git a/libical/src/test/icaltestparser.c b/libical/src/test/icaltestparser.c
index 98dbcff94f..71f91b641f 100644
--- a/libical/src/test/icaltestparser.c
+++ b/libical/src/test/icaltestparser.c
@@ -91,7 +91,6 @@ char* read_stream(char *s, size_t size, void *d)
 int main(int argc, char* argv[])
 {
 
-    int lineno = 0;
     char* line; 
     FILE* stream;
     icalcomponent *c; 
@@ -120,5 +119,5 @@ int main(int argc, char* argv[])
 
     } while ( line != 0);
 
-
-}
+    return 0;
+ }
-- 
cgit v1.2.3