projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Remove stray conflict marker.
[pspp]
/
lib
/
ChangeLog
diff --git
a/lib/ChangeLog
b/lib/ChangeLog
index 1e26ac1b68b1ae15800748c03a415580e7f664b0..fca51d585d07aea5fdc2d13fbc28718c7094950f 100644
(file)
--- 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