tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / fast / selectors / 001-expected.txt

diff --git a/LayoutTests/platform/efl/fast/selectors/001-expected.txt b/LayoutTests/platform/efl/fast/selectors/001-expected.txt
index fc5b39f..2549ac2 100755 (executable)
--- a/LayoutTests/platform/efl/fast/selectors/001-expected.txt
+++ b/LayoutTests/platform/efl/fast/selectors/001-expected.txt
@@ -1,5 +1,6 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
+<<<<<<< HEAD
 layer at (0,0) size 800x78
   RenderBlock {HTML} at (0,0) size 800x78
     RenderBody {BODY} at (8,12) size 784x54
@@ -15,3 +16,20 @@ layer at (0,0) size 800x78
       RenderBlock {P} at (0,40) size 784x14 [bgcolor=#00FF00]
         RenderText {#text} at (0,0) size 241x14
           text run at (0,0) width 241: "The background of this paragraph should be green."
+=======
+layer at (0,0) size 800x105
+  RenderBlock {HTML} at (0,0) size 800x105
+    RenderBody {BODY} at (8,16) size 784x73
+      RenderBlock {UL} at (0,0) size 784x38
+        RenderListItem {LI} at (40,0) size 744x19 [bgcolor=#00FF00]
+          RenderListMarker at (-18,0) size 7x19: bullet
+          RenderText {#text} at (0,0) size 304x19
+            text run at (0,0) width 304: "The background of this list item should be green"
+        RenderListItem {LI} at (40,19) size 744x19 [bgcolor=#00FF00]
+          RenderListMarker at (-18,0) size 7x19: bullet
+          RenderText {#text} at (0,0) size 381x19
+            text run at (0,0) width 381: "The background of this second list item should be also green"
+      RenderBlock {P} at (0,54) size 784x19 [bgcolor=#00FF00]
+        RenderText {#text} at (0,0) size 322x19
+          text run at (0,0) width 322: "The background of this paragraph should be green."
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d