From 7ca574f59c0cfa1c18dfad38e2695df7c5356ccd Mon Sep 17 00:00:00 2001
From: green <green@FreeBSD.org>
Date: Mon, 11 Mar 2002 22:36:26 +0000
Subject: Fix conflicts.

---
 lib/libz/trees.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/libz/trees.c')

diff --git a/lib/libz/trees.c b/lib/libz/trees.c
index 116d9f6..dd2a3a0 100644
--- a/lib/libz/trees.c
+++ b/lib/libz/trees.c
@@ -1,5 +1,5 @@
 /* trees.c -- output deflated data using Huffman coding
- * 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.1