From 4d22b11a56999255d263ddecadfbe73b9a80030d Mon Sep 17 00:00:00 2001 From: Brian Feldman Date: Mon, 11 Mar 2002 22:36:26 +0000 Subject: Fix conflicts. --- lib/libz/compress.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/libz/compress.c') diff --git a/lib/libz/compress.c b/lib/libz/compress.c index 9db5703ab96d..cc9a4e078c7a 100644 --- a/lib/libz/compress.c +++ b/lib/libz/compress.c @@ -1,5 +1,5 @@ /* compress.c -- compress a memory buffer - * Copyright (C) 1995-1998 Jean-loup Gailly. + * Copyright (C) 1995-2002 Jean-loup Gailly. * For conditions of distribution and use, see copyright notice in zlib.h */ -- cgit v1.2.3