Unreviewed attempt to fix the build.
authorryanhaddad@apple.com <ryanhaddad@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 16 Jul 2018 23:46:31 +0000 (23:46 +0000)
committerryanhaddad@apple.com <ryanhaddad@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 16 Jul 2018 23:46:31 +0000 (23:46 +0000)
* rendering/RenderThemeMac.mm:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@233870 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/rendering/RenderThemeMac.mm

index 3e96f53..188ea2a 100644 (file)
@@ -1,3 +1,9 @@
+2018-07-16  Ryan Haddad  <ryanhaddad@apple.com>
+
+        Unreviewed attempt to fix the build.
+
+        * rendering/RenderThemeMac.mm:
+
 2018-07-11  Dean Jackson  <dino@apple.com>
 
         Allow removal of white backgrounds
index 9b2406b..37665fd 100644 (file)
@@ -2778,7 +2778,6 @@ bool RenderThemeMac::paintAttachment(const RenderObject& renderer, const PaintIn
 
 #endif // ENABLE(ATTACHMENT_ELEMENT)
 
-<<<<<<< HEAD
 static CGColorRef colorForStyle(DocumentMarkerLineStyle style, bool useDarkMode)
 {
     switch (style) {