Mercurial > hg > octave-nkf > gnulib-hg
changeset 6613:2b0f7fda1c84
Remove stray conflict marker.
author | Jim Meyering <jim@meyering.net> |
---|---|
date | Wed, 25 Jan 2006 17:31:46 +0000 |
parents | d4440c93eb50 |
children | d39937296068 |
files | lib/ChangeLog |
diffstat | 1 files changed, 0 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff