Update

diff --git a/lib/ChangeLog b/lib/ChangeLog
index d2e0872d74d61d8e58f5f16b5d524a17341b6609..c516b148bc8ac94048b5a648580c413e1cc5e9b8 100644 (file)
--- 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