From 028ee5466b3dcefe5bc15d6a3d66fe89a3d91aa0 Mon Sep 17 00:00:00 2001
From: Robert Collins <rbtcollins@hotmail.com>
Date: Wed, 26 Dec 2001 12:48:12 +0000
Subject: [PATCH] Remove accenidentally left >>> marker

---
 winsup/cygwin/ChangeLog | 1 -
 1 file changed, 1 deletion(-)

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index f700246b2..54c62f132 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -123,7 +123,6 @@
 	* net.cc (cygwin_getsockopt): Dereference optlen pointer when passing
 	to __check_null_invalid_struct_errno.
 
->>>>>>> 1.1060
 2001-12-03  Christopher Faylor  <cgf@redhat.com>
 
 	* net.cc (cygwin_getsockopt): Allow NULL optval.