Commit 6751878d authored by's avatar

Fix build.

git-svn-id: 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent d6c45992
......@@ -137,11 +137,8 @@ namespace WebKit {
macro(UsesEncodingDetector, usesEncodingDetector, Bool, bool, false) \
macro(TextAutosizingEnabled, textAutosizingEnabled, Bool, bool, false) \
macro(AggressiveTileRetentionEnabled, aggressiveTileRetentionEnabled, Bool, bool, false) \
<<<<<<< HEAD
macro(QTKitEnabled, isQTKitEnabled, Bool, bool, true) \
macro(LogsPageMessagesToSystemConsoleEnabled, logsPageMessagesToSystemConsoleEnabled, Bool, bool, false) \
>>>>>>> Make logging console messages to STDOUT work in WebKit2 via a new setting.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment