tizen beta release

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

diff --git a/LayoutTests/platform/efl/css3/selectors3/xml/css3-modsel-104b-expected.txt b/LayoutTests/platform/efl/css3/selectors3/xml/css3-modsel-104b-expected.txt
index 18f8590..b2f1b53 100755 (executable)
--- a/LayoutTests/platform/efl/css3/selectors3/xml/css3-modsel-104b-expected.txt
+++ b/LayoutTests/platform/efl/css3/selectors3/xml/css3-modsel-104b-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 {test} at (0,0) size 800x116
     RenderBlock {p} at (0,12) size 800x14 [bgcolor=#00FF00]
@@ -14,3 +15,19 @@ layer at (0,0) size 800x116
     RenderBlock {s} at (0,90) size 800x14 [bgcolor=#00FF00]
       RenderText {#text} at (0,0) size 227x14
         text run at (0,0) width 227: "This paragraph should have a green background"
+=======
+layer at (0,0) size 800x156
+  RenderBlock {test} at (0,0) size 800x156
+    RenderBlock {p} at (0,16) size 800x19 [bgcolor=#00FF00]
+      RenderText {#text} at (0,0) size 304x19
+        text run at (0,0) width 304: "This paragraph should have a green background"
+    RenderBlock {q} at (0,51) size 800x19
+      RenderText {#text} at (0,0) size 221x19
+        text run at (0,0) width 221: "This paragraph should be unstyled."
+    RenderBlock {r} at (0,86) size 800x19 [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,121) size 800x19 [bgcolor=#00FF00]
+      RenderText {#text} at (0,0) size 304x19
+        text run at (0,0) width 304: "This paragraph should have a green background"
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d