From 3bcec82fe724f0e6b48557d3ac4cd48fb8426696 Mon Sep 17 00:00:00 2001
From: Aleksandar Sasha Babic <aleksandar.babic@nokia.com>
Date: Thu, 21 May 2009 14:46:26 +0200
Subject: Resolving some merge issues.

---
 tests/auto/network-settings.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/auto/network-settings.h b/tests/auto/network-settings.h
index 7204b27..88e9fb7 100644
--- a/tests/auto/network-settings.h
+++ b/tests/auto/network-settings.h
@@ -1,6 +1,4 @@
 /****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: Qt Software Information (qt-info@nokia.com)
 **
 ** This file is part of the test suite of the Qt Toolkit.
@@ -308,12 +306,14 @@ private:
     }
 #endif
 
+/*
 #ifdef QT_NETWORK_LIB
     static QHostAddress serverIP()
     {
         return QHostInfo::fromName(serverName()).addresses().first();
     }
 #endif
+*/
 
 };
 #ifdef Q_OS_SYMBIAN
-- 
cgit v0.12