From 303adc96205cfa0930512d12573dccc697a9bd4c Mon Sep 17 00:00:00 2001
From: hpa <hpa>
Date: Sat, 5 Jan 2002 22:22:39 +0000
Subject: [PATCH] Correct merge conflict.

---
 CHANGES | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index b13387f..79eceb5 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3,8 +3,9 @@ $Id$
 Changes in 0.29:
 	Posixly correctness.
 
-	Now works on Win32 systems using Cygwin	(see
-	<http://www.cygwin.com/>).
+	Now compiles and runs on Win32 systems using Cygwin
+	(http://www.cygwin.com/).
+	(<http://www.cygwin.com/>).
 
 	Fixed a bug which could cause a standalone server to exit with
 	a "recvfrom: Interrupted system call" log message if signals