From 2096a4498c5cc195e7f72e43f78bd88900558bfd Mon Sep 17 00:00:00 2001
From: Jim Meyering <jim@meyering.net>
Date: Wed, 25 Jan 2006 17:31:46 +0000
Subject: [PATCH] Remove stray conflict marker.

---
 lib/ChangeLog | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 1e26ac1b68..fca51d585d 100644
--- 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
-- 
2.30.2