summaryrefslogtreecommitdiffstats
path: root/tests/auto/network-settings.h
diff options
context:
space:
mode:
authorJanne Anttila <janne.anttila@digia.com>2009-04-28 07:34:09 (GMT)
committerJanne Anttila <janne.anttila@digia.com>2009-04-28 07:34:09 (GMT)
commit189118e55fa4d3ac205d78130d2b4694e0fc9b86 (patch)
treec22efd90e3880ae7fdf03ad7a5c5c6a6eb8eba32 /tests/auto/network-settings.h
parent3e95fb56113b5b039408498032f9b6365e77c5e2 (diff)
downloadQt-189118e55fa4d3ac205d78130d2b4694e0fc9b86.zip
Qt-189118e55fa4d3ac205d78130d2b4694e0fc9b86.tar.gz
Qt-189118e55fa4d3ac205d78130d2b4694e0fc9b86.tar.bz2
Fixed unresolved merge conflict in network-settings.h
Diffstat (limited to 'tests/auto/network-settings.h')
-rw-r--r--tests/auto/network-settings.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/tests/auto/network-settings.h b/tests/auto/network-settings.h
index 8195c40..9afe815 100644
--- a/tests/auto/network-settings.h
+++ b/tests/auto/network-settings.h
@@ -168,15 +168,12 @@ public:
expected = expected.append(" Cyrus IMAP4 v2.3.11-Mandriva-RPM-2.3.11-6mdv2008.1 server ready\r\n");
return expected;
}
-<<<<<<< HEAD:tests/auto/network-settings.h
static QByteArray expectedReplyFtp()
{
QByteArray expected( "220 (vsFTPd 2.0.5)\r\n221 Goodbye.\r\n" );
return expected;
}
-=======
->>>>>>> 6d41f31... Nwteork server test related data (serever name, IP address ...) can now:tests/auto/network-settings.h
#ifdef Q_OS_SYMBIAN
static void setDefaultIap()