tizen beta release

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

diff --git a/LayoutTests/platform/efl/css3/selectors3/xml/css3-modsel-161-expected.txt b/LayoutTests/platform/efl/css3/selectors3/xml/css3-modsel-161-expected.txt
index cf875a8..196f0fc 100755 (executable)
--- a/LayoutTests/platform/efl/css3/selectors3/xml/css3-modsel-161-expected.txt
+++ b/LayoutTests/platform/efl/css3/selectors3/xml/css3-modsel-161-expected.txt
@@ -1,5 +1,6 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
+<<<<<<< HEAD
 layer at (0,0) size 800x112
   RenderBlock {test} at (0,0) size 800x112
     RenderBlock {p} at (0,12) size 800x14 [bgcolor=#00FF00]
@@ -19,3 +20,24 @@ layer at (0,0) size 800x112
           RenderTableCell {td} at (2,2) size 319x16 [r=0 c=0 rs=1 cs=1]
             RenderText {#text} at (1,1) size 317x14
               text run at (1,1) width 317: "This line should have a green background (or it might be unstyled)."
+=======
+layer at (0,0) size 800x154
+  RenderBlock {test} at (0,0) size 800x154
+    RenderBlock {p} at (0,16) size 800x19 [bgcolor=#00FF00]
+      RenderText {#text} at (0,0) size 268x19
+        text run at (0,0) width 268: "This line should have a green background."
+    RenderBlock {p} at (0,51) size 800x62 [bgcolor=#00FF00]
+      RenderText {#text} at (0,0) size 692x19
+        text run at (0,0) width 692: "UAs may render the following element as a pop up menu. If so, please ensure the menu is unstyled (or green)."
+      RenderMenuList {select} at (2,21) size 149x39 [color=#202020]
+        RenderBlock (anonymous) at (15,10) size 93x19
+          RenderText at (0,0) size 83x19
+            text run at (0,0) width 83: "This should"
+      RenderText {#text} at (0,0) size 0x0
+    RenderTable {table} at (0,129) size 429x25 [bgcolor=#00FF00]
+      RenderTableSection (anonymous) at (0,0) size 429x25
+        RenderTableRow {tr} at (0,2) size 429x21
+          RenderTableCell {td} at (2,2) size 425x21 [r=0 c=0 rs=1 cs=1]
+            RenderText {#text} at (1,1) size 423x19
+              text run at (1,1) width 423: "This line should have a green background (or it might be unstyled)."
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d