summaryrefslogtreecommitdiff
path: root/apt-pkg/contrib/strutl.cc
diff options
context:
space:
mode:
authorMichael Vogt <mvo@debian.org>2013-07-10 16:38:55 +0200
committerMichael Vogt <mvo@debian.org>2013-07-10 16:38:55 +0200
commitd2636e63fd823e537f61b5e9d33a85aa0626f0aa (patch)
tree1041902cfd6820605314424f239b27c18ae4ef2b /apt-pkg/contrib/strutl.cc
parent88f5f8258f0d6f9d3a188ccf8a89f36243ea14b5 (diff)
remove more merge artifacts
Diffstat (limited to 'apt-pkg/contrib/strutl.cc')
-rw-r--r--apt-pkg/contrib/strutl.cc1
1 files changed, 0 insertions, 1 deletions
diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc
index 8ce3a306f..d0e74d8c5 100644
--- a/apt-pkg/contrib/strutl.cc
+++ b/apt-pkg/contrib/strutl.cc
@@ -759,7 +759,6 @@ bool ReadMessages(int Fd, vector<string> &List)
for (char *I = Buffer; I + 1 < End; I++)
{
if (I[1] != '\n' ||
-
(I[0] != '\n' && strncmp(I, "\r\n\r\n", 4) != 0))
continue;