diff options
Diffstat (limited to 'WebCore/platform/network/ResourceHandleInternal.h')
| -rw-r--r-- | WebCore/platform/network/ResourceHandleInternal.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/WebCore/platform/network/ResourceHandleInternal.h b/WebCore/platform/network/ResourceHandleInternal.h index 8313560..f7135ee 100644 --- a/WebCore/platform/network/ResourceHandleInternal.h +++ b/WebCore/platform/network/ResourceHandleInternal.h @@ -218,15 +218,9 @@ namespace WebCore { // It is almost identical to m_currentWebChallenge.nsURLAuthenticationChallenge(), but has a different sender. NSURLAuthenticationChallenge *m_currentMacChallenge; #endif -<<<<<<< HEAD:WebCore/platform/network/ResourceHandleInternal.h -#if USE(CFNETWORK) - CFURLAuthChallengeRef m_currentCFChallenge; -#endif #if PLATFORM(ANDROID) RefPtr<ResourceLoaderAndroid> m_loader; #endif -======= ->>>>>>> webkit.org at r51976:WebCore/platform/network/ResourceHandleInternal.h AuthenticationChallenge m_currentWebChallenge; ResourceHandle::FailureType m_failureType; |