# HG changeset patch
# User Sergey Poznyakoff <gray@gnu.org.ua>
# Date 1138206142 0
# Node ID 4033ab84f3a067438fccbe182eb0914d16322852
# Parent  959e130e3011c7be23fd1eb4e11ca581928fcab5
Update

diff --git a/lib/ChangeLog b/lib/ChangeLog
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,7 @@
+2006-01-25  Sergey Poznyakoff  <gray@gnu.org.ua>
+
+	* argp-namefrob.h: Bugfix. Remove stray #
+
 2006-01-25  Bruno Haible  <bruno@clisp.org>
 
 	* stdbool_.h (_Bool) [IRIX cc]: Define as 'signed char', to avoid
@@ -29,6 +33,7 @@
 	* 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