diff options
Diffstat (limited to 'WebCore/workers')
| -rw-r--r-- | WebCore/workers/WorkerContext.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/WebCore/workers/WorkerContext.cpp b/WebCore/workers/WorkerContext.cpp index e960514..9a88309 100644 --- a/WebCore/workers/WorkerContext.cpp +++ b/WebCore/workers/WorkerContext.cpp @@ -49,15 +49,7 @@ #include "WorkerThreadableLoader.h" #include "XMLHttpRequestException.h" #include <wtf/RefPtr.h> -<<<<<<< HEAD:WebCore/workers/WorkerContext.cpp -#if PLATFORM(ANDROID) -======= ->>>>>>> webkit.org at r50258.:WebCore/workers/WorkerContext.cpp #include <wtf/UnusedParam.h> -<<<<<<< HEAD:WebCore/workers/WorkerContext.cpp -#endif -======= ->>>>>>> webkit.org at r50258.:WebCore/workers/WorkerContext.cpp #if ENABLE(NOTIFICATIONS) #include "NotificationCenter.h" |