aboutsummaryrefslogtreecommitdiff
path: root/Makeconfig
diff options
context:
space:
mode:
authorAndreas Schwab <schwab@suse.de>2009-01-21 23:14:12 +0000
committerAndreas Schwab <schwab@suse.de>2009-01-21 23:14:12 +0000
commitf00d47a36f231efd49b8088cd74c9b092f9dbc4a (patch)
treef87e95c4553798a8854a773a9562a50e10a5a262 /Makeconfig
parent965cb60a21674edb8e20b1a2a41297bcd4622361 (diff)
downloadglibc-f00d47a36f231efd49b8088cd74c9b092f9dbc4a.zip
glibc-f00d47a36f231efd49b8088cd74c9b092f9dbc4a.tar.gz
glibc-f00d47a36f231efd49b8088cd74c9b092f9dbc4a.tar.bz2
Remove conflict marker.
Properly handle partial reads. Ulrich Drepper <drepper@redhat.com> Reported by Peter Festner <peter.festner@ewetel.net>. Tomas Janousek <tjanouse@redhat.com> Ulrich Drepper <drepper@redhat.com>
Diffstat (limited to 'Makeconfig')
0 files changed, 0 insertions, 0 deletions