diff options
Diffstat (limited to 'JavaScriptCore/wtf/Platform.h')
| -rw-r--r-- | JavaScriptCore/wtf/Platform.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/JavaScriptCore/wtf/Platform.h b/JavaScriptCore/wtf/Platform.h index 091ba4f..dbe2f8e 100644 --- a/JavaScriptCore/wtf/Platform.h +++ b/JavaScriptCore/wtf/Platform.h @@ -546,10 +546,7 @@ // This prevents unnecessary invals. #define ENABLE_TEXT_CARET 1 #define ENABLE_JAVASCRIPT_DEBUGGER 0 -<<<<<<< HEAD:JavaScriptCore/wtf/Platform.h #define ENABLE_ORIENTATION_EVENTS 1 -======= ->>>>>>> webkit.org at r51976:JavaScriptCore/wtf/Platform.h #endif #if PLATFORM(WIN) |