tizen beta release

[profile/ivi/webkit-efl.git] / LayoutTests / platform / efl / css3 / selectors3 / xhtml / css3-modsel-143-expected.txt

diff --git a/LayoutTests/platform/efl/css3/selectors3/xhtml/css3-modsel-143-expected.txt b/LayoutTests/platform/efl/css3/selectors3/xhtml/css3-modsel-143-expected.txt
index ead46d0..1fa1407 100755 (executable)
--- a/LayoutTests/platform/efl/css3/selectors3/xhtml/css3-modsel-143-expected.txt
+++ b/LayoutTests/platform/efl/css3/selectors3/xhtml/css3-modsel-143-expected.txt
@@ -1,5 +1,6 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
+<<<<<<< HEAD
 layer at (0,0) size 800x142
   RenderBlock {html} at (0,0) size 800x142
     RenderBody {body} at (8,12) size 784x118
@@ -19,3 +20,24 @@ layer at (0,0) size 800x142
         RenderBlock {t} at (0,104) size 784x14 [bgcolor=#00FF00]
           RenderText {#text} at (0,0) size 230x14
             text run at (0,0) width 230: "This paragraph should have a green background."
+=======
+layer at (0,0) size 800x191
+  RenderBlock {html} at (0,0) size 800x191
+    RenderBody {body} at (8,16) size 784x159
+      RenderBlock {div} at (0,0) size 784x159
+        RenderBlock {p} at (0,0) size 784x19
+          RenderText {#text} at (0,0) size 221x19
+            text run at (0,0) width 221: "This paragraph should be unstyled."
+        RenderBlock {q} at (0,35) size 784x19 [bgcolor=#00FF00]
+          RenderText {#text} at (0,0) size 308x19
+            text run at (0,0) width 308: "This paragraph should have a green background."
+        RenderBlock {r} at (0,70) size 784x19
+          RenderText {#text} at (0,0) size 221x19
+            text run at (0,0) width 221: "This paragraph should be unstyled."
+        RenderBlock {s} at (0,105) size 784x19 [bgcolor=#00FF00]
+          RenderText {#text} at (0,0) size 308x19
+            text run at (0,0) width 308: "This paragraph should have a green background."
+        RenderBlock {t} at (0,140) size 784x19 [bgcolor=#00FF00]
+          RenderText {#text} at (0,0) size 308x19
+            text run at (0,0) width 308: "This paragraph should have a green background."
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d