tizen beta release

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

diff --git a/LayoutTests/platform/efl/css3/selectors3/xhtml/css3-modsel-130b-expected.txt b/LayoutTests/platform/efl/css3/selectors3/xhtml/css3-modsel-130b-expected.txt
index 34a5b17..bc21e85 100755 (executable)
--- a/LayoutTests/platform/efl/css3/selectors3/xhtml/css3-modsel-130b-expected.txt
+++ b/LayoutTests/platform/efl/css3/selectors3/xhtml/css3-modsel-130b-expected.txt
@@ -1,5 +1,6 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
+<<<<<<< HEAD
 layer at (0,0) size 800x86
   RenderBlock {html} at (0,0) size 800x86
     RenderBody {body} at (8,8) size 784x66
@@ -13,3 +14,18 @@ layer at (0,0) size 800x86
         RenderBlock {s} at (0,52) 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 800x113
+  RenderBlock {html} at (0,0) size 800x113
+    RenderBody {body} at (8,8) size 784x89
+      RenderBlock {div} at (0,0) size 784x89
+        RenderBlock {q} at (0,0) 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,35) 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,70) size 784x19
+          RenderText {#text} at (0,0) size 221x19
+            text run at (0,0) width 221: "This paragraph should be unstyled."
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d