tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / fast / selectors / unqualified-hover-strict-expected.txt

diff --git a/LayoutTests/platform/efl/fast/selectors/unqualified-hover-strict-expected.txt b/LayoutTests/platform/efl/fast/selectors/unqualified-hover-strict-expected.txt
index b69437a..fe26486 100755 (executable)
--- a/LayoutTests/platform/efl/fast/selectors/unqualified-hover-strict-expected.txt
+++ b/LayoutTests/platform/efl/fast/selectors/unqualified-hover-strict-expected.txt
@@ -1,5 +1,6 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
+<<<<<<< HEAD
 layer at (0,0) size 800x70
   RenderBlock {HTML} at (0,0) size 800x70
     RenderBody {BODY} at (8,14) size 784x44
@@ -9,3 +10,14 @@ layer at (0,0) size 800x70
       RenderBlock {P} at (0,30) size 784x14
         RenderText {#text} at (0,0) size 517x14
           text run at (0,0) width 517: "Moving the mouse anywhere over the document should result in the background color being changed to grey."
+=======
+layer at (0,0) size 800x93
+  RenderBlock {HTML} at (0,0) size 800x93
+    RenderBody {BODY} at (8,18) size 784x59
+      RenderBlock {H3} at (0,0) size 784x22
+        RenderText {#text} at (0,0) size 455x22
+          text run at (0,0) width 455: "Test of unqualifed :hover selector in strict parsing mode"
+      RenderBlock {P} at (0,40) size 784x19
+        RenderText {#text} at (0,0) size 691x19
+          text run at (0,0) width 691: "Moving the mouse anywhere over the document should result in the background color being changed to grey."
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d