tizen beta release

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

diff --git a/LayoutTests/platform/efl/css3/selectors3/xml/css3-modsel-81-expected.txt b/LayoutTests/platform/efl/css3/selectors3/xml/css3-modsel-81-expected.txt
index 39442c7..dcfba91 100755 (executable)
--- a/LayoutTests/platform/efl/css3/selectors3/xml/css3-modsel-81-expected.txt
+++ b/LayoutTests/platform/efl/css3/selectors3/xml/css3-modsel-81-expected.txt
@@ -1,5 +1,6 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
+<<<<<<< HEAD
 layer at (0,0) size 800x90
   RenderBlock {test} at (0,0) size 800x90
     RenderBlock {p} at (0,12) size 800x14 [bgcolor=#00FF00]
@@ -12,3 +13,17 @@ layer at (0,0) size 800x90
       RenderBlock {p} at (0,26) size 800x14
         RenderText {#text} at (0,0) size 166x14
           text run at (0,0) width 166: "This paragraph should be unstyled."
+=======
+layer at (0,0) size 800x121
+  RenderBlock {test} at (0,0) size 800x121
+    RenderBlock {p} at (0,16) size 800x19 [bgcolor=#00FF00]
+      RenderText {#text} at (0,0) size 308x19
+        text run at (0,0) width 308: "This paragraph should have a green background."
+    RenderBlock {div} at (0,51) size 800x54
+      RenderBlock (anonymous) at (0,0) size 800x19
+        RenderText {#text} at (0,0) size 238x19
+          text run at (0,0) width 238: "This div contains only one paragraph."
+      RenderBlock {p} at (0,35) size 800x19
+        RenderText {#text} at (0,0) size 221x19
+          text run at (0,0) width 221: "This paragraph should be unstyled."
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d