From 189118e55fa4d3ac205d78130d2b4694e0fc9b86 Mon Sep 17 00:00:00 2001
From: Janne Anttila <janne.anttila@digia.com>
Date: Tue, 28 Apr 2009 10:34:09 +0300
Subject: Fixed unresolved merge conflict in network-settings.h

---
 tests/auto/network-settings.h | 3 ---
 1 file changed, 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()
-- 
cgit v0.12