diff options
Diffstat (limited to 'WebCore/loader/appcache/DOMApplicationCache.cpp')
| -rw-r--r-- | WebCore/loader/appcache/DOMApplicationCache.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/WebCore/loader/appcache/DOMApplicationCache.cpp b/WebCore/loader/appcache/DOMApplicationCache.cpp index 1496b8a..29c1bd5 100644 --- a/WebCore/loader/appcache/DOMApplicationCache.cpp +++ b/WebCore/loader/appcache/DOMApplicationCache.cpp @@ -120,14 +120,11 @@ EventTargetData* DOMApplicationCache::eventTargetData() return &m_eventTargetData; } -<<<<<<< HEAD:WebCore/loader/appcache/DOMApplicationCache.cpp -======= EventTargetData* DOMApplicationCache::ensureEventTargetData() { return &m_eventTargetData; } ->>>>>>> webkit.org at 49305:WebCore/loader/appcache/DOMApplicationCache.cpp } // namespace WebCore #endif // ENABLE(OFFLINE_WEB_APPLICATIONS) |