From: rbcollins <rbcollins>
Date: Wed, 26 Dec 2001 12:48:12 +0000 (+0000)
Subject: Remove accenidentally left >>> marker
X-Git-Tag: cygwin_daemon_merge_HEAD~1326
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=5cfdcc6b14862d1ddf07eb089e9a18ec0c946260;p=pf3gnuchains%2Fpf3gnuchains4x.git

Remove accenidentally left >>> marker
---

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index f700246b2a..54c62f1322 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.