summaryrefslogtreecommitdiff
path: root/src/networkaccessmanager.cpp
diff options
context:
space:
mode:
authoradjam <adjam@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2009-05-07 09:45:30 +0000
committeradjam <adjam@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2009-05-07 09:45:30 +0000
commitf8d79895735973381665d7cf5012b2ea41efa400 (patch)
treecc490c88a63b957ce8d6592c9888e3222c29fc45 /src/networkaccessmanager.cpp
parentEBN Krazy fixes. 2nd round.. (diff)
parentImproved contextual menu usability (diff)
downloadrekonq-f8d79895735973381665d7cf5012b2ea41efa400.tar.xz
Fixing MERGING issues..
git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/playground/network/rekonq@964690 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'src/networkaccessmanager.cpp')
-rw-r--r--src/networkaccessmanager.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/networkaccessmanager.cpp b/src/networkaccessmanager.cpp
index c9b94a8d..deae42dd 100644
--- a/src/networkaccessmanager.cpp
+++ b/src/networkaccessmanager.cpp
@@ -165,4 +165,3 @@ void NetworkAccessManager::sslErrors(QNetworkReply *reply, const QList<QSslError
reply->ignoreSslErrors();
}
#endif
-