diff options
Diffstat (limited to 'Source/WebCore/platform/DragData.h')
| -rw-r--r-- | Source/WebCore/platform/DragData.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/Source/WebCore/platform/DragData.h b/Source/WebCore/platform/DragData.h index 3bd27fc..42d0d3a 100644 --- a/Source/WebCore/platform/DragData.h +++ b/Source/WebCore/platform/DragData.h @@ -123,9 +123,5 @@ private: } -<<<<<<< HEAD -#endif //!DragData_h -======= #endif // !DragData_h ->>>>>>> WebKit.org @ r75993 |