tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / fast / lists / 007-vertical-expected.txt

diff --git a/LayoutTests/platform/efl/fast/lists/007-vertical-expected.txt b/LayoutTests/platform/efl/fast/lists/007-vertical-expected.txt
index bb22a5b..5a17564 100755 (executable)
--- a/LayoutTests/platform/efl/fast/lists/007-vertical-expected.txt
+++ b/LayoutTests/platform/efl/fast/lists/007-vertical-expected.txt
@@ -2,6 +2,7 @@ layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
 layer at (0,0) size 800x600
   RenderBlock {HTML} at (0,0) size 800x600
+<<<<<<< HEAD
     RenderBody {BODY} at (8,8) size 780x584
       RenderBlock {UL} at (0,0) size 70x584 [bgcolor=#808080] [border: (25px solid #008000) none]
         RenderListItem {LI} at (0,50) size 28x534
@@ -16,3 +17,20 @@ layer at (0,0) size 800x600
             text run at (14,50) width 80: "double-checked. "
             text run at (14,130) width 403: "This list item has its left padding also set to 25 pixels, which should combine with the"
             text run at (28,50) width 200: "list's padding to make 50 pixels of margin."
+=======
+    RenderBody {BODY} at (8,8) size 776x584
+      RenderBlock {UL} at (0,0) size 114x584 [bgcolor=#808080] [border: (25px solid #008000) none]
+        RenderListItem {LI} at (0,50) size 38x534
+          RenderListMarker at (0,-18) size 19x7: bullet
+          RenderText {#text} at (0,0) size 38x520
+            text run at (0,0) width 520: "The top padding on this unordered list has been set to 25 pixels, which will require"
+            text run at (19,0) width 191: "some extra test in order to test."
+        RenderListItem {LI} at (38,50) size 76x534 [bgcolor=#FFFFFF] [border: (25px solid #008000) none]
+          RenderListMarker at (0,-18) size 19x7: bullet
+          RenderText {#text} at (0,50) size 76x473
+            text run at (0,50) width 473: "Another list item might not be such a bad idea, either, considering that such"
+            text run at (19,50) width 239: "things do need to be double-checked. "
+            text run at (19,289) width 232: "This list item has its left padding also"
+            text run at (38,50) width 460: "set to 25 pixels, which should combine with the list's padding to make 50"
+            text run at (57,50) width 106: "pixels of margin."
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d