# HG changeset patch
# User Jim Meyering <jim@meyering.net>
# Date 1138210306 0
# Node ID 2b0f7fda1c840d47387dda57e641383241e71118
# Parent  d4440c93eb5002aef63eb5f0b0276a4e7a4697e6
Remove stray conflict marker.

diff --git a/lib/ChangeLog b/lib/ChangeLog
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -57,7 +57,6 @@
 	* socket_.h (SHUT_WR, SHUT_RDWR): Don't hardcode, suggested by
 	Bruno.
 
->>>>>>> 1.1090
 2006-01-23  Paul Eggert  <eggert@cs.ucla.edu>
 
 	Work around porting bugs reported by Dieter in