Remove accenidentally left >>> marker

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index f700246..54c62f1 100644 (file)
--- 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.