Mercurial > hg > octave-lojdl > gnulib-hg

changeset 6613:2b0f7fda1c84

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
--- 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  <eggert@cs.ucla.edu>
 
 	Work around porting bugs reported by Dieter in