diff options
| author | Steve Block <steveblock@google.com> | 2009-10-09 13:27:03 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2009-10-20 00:41:59 +0100 |
| commit | 3f252f84468859d129a8c6a9302412d2e6e5a3fa (patch) | |
| tree | 109b326a088d13e83fd53b4bace151f800647c1a /WebCore/loader/appcache | |
| parent | 231d4e3152a9c27a73b6ac7badbe6be673aa3ddf (diff) | |
| download | external_webkit-3f252f84468859d129a8c6a9302412d2e6e5a3fa.zip external_webkit-3f252f84468859d129a8c6a9302412d2e6e5a3fa.tar.gz external_webkit-3f252f84468859d129a8c6a9302412d2e6e5a3fa.tar.bz2 | |
Merge webkit.org at R49305 : Fix merge conflicts.
Change-Id: I9e0ffbe9b9b824399653da038093874e315ccd6a
Diffstat (limited to 'WebCore/loader/appcache')
| -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) |