diff options
Diffstat (limited to 'WebCore/platform/DragImage.h')
| -rw-r--r-- | WebCore/platform/DragImage.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/WebCore/platform/DragImage.h b/WebCore/platform/DragImage.h index 00bd7ed..f9b7ff3 100644 --- a/WebCore/platform/DragImage.h +++ b/WebCore/platform/DragImage.h @@ -74,13 +74,10 @@ namespace WebCore { typedef wxDragImage* DragImageRef; #elif PLATFORM(GTK) typedef GdkPixbuf* DragImageRef; -<<<<<<< HEAD:WebCore/platform/DragImage.h -#elif PLATFORM(ANDROID) - typedef void* DragImageRef; -======= #elif PLATFORM(HAIKU) typedef BBitmap* DragImageRef; ->>>>>>> webkit.org at 49305:WebCore/platform/DragImage.h +#elif PLATFORM(ANDROID) + typedef void* DragImageRef; #endif IntSize dragImageSize(DragImageRef); |