tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / css3 / selectors3 / xhtml / css3-modsel-98b-expected.txt

diff --git a/LayoutTests/platform/efl/css3/selectors3/xhtml/css3-modsel-98b-expected.txt b/LayoutTests/platform/efl/css3/selectors3/xhtml/css3-modsel-98b-expected.txt
index f384ae1..ba29fd4 100755 (executable)
--- a/LayoutTests/platform/efl/css3/selectors3/xhtml/css3-modsel-98b-expected.txt
+++ b/LayoutTests/platform/efl/css3/selectors3/xhtml/css3-modsel-98b-expected.txt
@@ -1,5 +1,6 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
+<<<<<<< HEAD
 layer at (0,0) size 800x116
   RenderBlock {html} at (0,0) size 800x116
     RenderBody {body} at (8,12) size 784x92
@@ -15,3 +16,20 @@ layer at (0,0) size 800x116
       RenderBlock {r} at (0,78) size 784x14
         RenderText {#text} at (0,0) size 166x14
           text run at (0,0) width 166: "This paragraph should be unstyled."
+=======
+layer at (0,0) size 800x156
+  RenderBlock {html} at (0,0) size 800x156
+    RenderBody {body} at (8,16) size 784x124
+      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 304x19
+          text run at (0,0) width 304: "This paragraph should have a green background"
+      RenderBlock {s} 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 {r} at (0,105) size 784x19
+        RenderText {#text} at (0,0) size 221x19
+          text run at (0,0) width 221: "This paragraph should be unstyled."
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d