Mercurial > hg > octave-nkf > gnulib-hg
changeset 9212:09cf746577d7
* ChangeLog: Remove conflict markers.
author | Eric Blake <ebb9@byu.net> |
---|---|
date | Thu, 13 Sep 2007 13:52:18 +0000 |
parents | c3c134042c0b |
children | 6c916785c03e |
files | ChangeLog |
diffstat | 1 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2007-09-13 Eric Blake <ebb9@byu.net> + + * ChangeLog: Remove conflict markers. + 2007-09-13 Simon Josefsson <simon@josefsson.org> * lib/gc-gnulib.c (gc_hash_open): Catch NULL calloc return value. @@ -33010,9 +33014,6 @@ * m4/isc-posix.m4: New file. -<<<<<<< ChangeLog -1998-05-10 Jim Meyering <meyering@ascend.com> -======= 1998-05-10 Jim Meyering <meyering@ascend.com> * m4/jm-mktime.m4: Use AM_FUNC_MKTIME, now that it's up to date. @@ -33091,4 +33092,3 @@ Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, are permitted provided the copyright notice and this notice are preserved. ->>>>>>> 1.1932