From d7f57ad7fed3c4ec76ccbe8da642569711017ba5 Mon Sep 17 00:00:00 2001 From: Federico Mena Quintero Date: Tue, 12 Dec 2000 00:27:42 +0000 Subject: Fix fucking CVS conflicts - Federico svn path=/trunk/; revision=6928 --- libical/src/test/copycluster.c | 1 + libical/src/test/regression.c | 1 + libical/src/test/storage.c | 1 + libical/src/test/stow.c | 1 + 4 files changed, 4 insertions(+) (limited to 'libical/src/test') diff --git a/libical/src/test/copycluster.c b/libical/src/test/copycluster.c index 0d6722fc94..11e648d861 100644 --- a/libical/src/test/copycluster.c +++ b/libical/src/test/copycluster.c @@ -4,6 +4,7 @@ CREATOR: eric 15 January 2000 $Id$ + $Locker$ (C) COPYRIGHT 2000 Eric Busboom http://www.softwarestudio.org diff --git a/libical/src/test/regression.c b/libical/src/test/regression.c index 1d66ee4fc5..b14e8aa6f8 100644 --- a/libical/src/test/regression.c +++ b/libical/src/test/regression.c @@ -6,6 +6,7 @@ DESCRIPTION: $Id$ + $Locker$ (C) COPYRIGHT 1999 Eric Busboom http://www.softwarestudio.org diff --git a/libical/src/test/storage.c b/libical/src/test/storage.c index b8eb48c30f..8251babefe 100644 --- a/libical/src/test/storage.c +++ b/libical/src/test/storage.c @@ -6,6 +6,7 @@ DESCRIPTION: $Id$ + $Locker$ (C) COPYRIGHT 1999 Eric Busboom http://www.softwarestudio.org diff --git a/libical/src/test/stow.c b/libical/src/test/stow.c index 6c285afc77..a305d161fe 100644 --- a/libical/src/test/stow.c +++ b/libical/src/test/stow.c @@ -4,6 +4,7 @@ CREATOR: eric 29 April 2000 $Id$ + $Locker$ (C) COPYRIGHT 2000 Eric Busboom http://www.softwarestudio.org -- cgit v1.2.3