From: Jim Meyering Date: Wed, 25 Jan 2006 17:31:46 +0000 (+0000) Subject: Remove stray conflict marker. X-Git-Tag: cvs-readonly~2573 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=2096a4498c5cc195e7f72e43f78bd88900558bfd;p=gnulib.git Remove stray conflict marker. --- 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 Work around porting bugs reported by Dieter in