[webkit-changes] [140052] trunk/Source/WebKit2/Shared/WebPreferencesStore.h

[timothy]

Title: [140052] trunk/Source/WebKit2/Shared/WebPreferencesStore.h

Revision

140052

Author

timo...@apple.com

Date

2013-01-17 14:54:57 -0800 (Thu, 17 Jan 2013)

Log Message

Fix build.

Modified Paths

• trunk/Source/WebKit2/Shared/WebPreferencesStore.h

Diff

Modified: trunk/Source/WebKit2/Shared/WebPreferencesStore.h (140051 => 140052)

--- trunk/Source/WebKit2/Shared/WebPreferencesStore.h	2013-01-17 22:53:14 UTC (rev 140051)
+++ trunk/Source/WebKit2/Shared/WebPreferencesStore.h	2013-01-17 22:54:57 UTC (rev 140052)
@@ -137,11 +137,8 @@
     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.
     \
 
 #define FOR_EACH_WEBKIT_DOUBLE_PREFERENCE(macro) \

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes