tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / fast / block / positioning / padding-percent-expected.txt

diff --git a/LayoutTests/platform/efl/fast/block/positioning/padding-percent-expected.txt b/LayoutTests/platform/efl/fast/block/positioning/padding-percent-expected.txt
index 8675aa0..681a33f 100755 (executable)
--- a/LayoutTests/platform/efl/fast/block/positioning/padding-percent-expected.txt
+++ b/LayoutTests/platform/efl/fast/block/positioning/padding-percent-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 784x580
       RenderBlock {OL} at (0,0) size 784x28
         RenderListItem {LI} at (40,0) size 744x14
@@ -16,3 +17,19 @@ layer at (8,48) size 109x20
   RenderBlock (positioned) {DIV} at (8,48) size 109x20 [border: (3px solid #000000)]
     RenderText {#text} at (43,3) size 63x14
       text run at (43,3) width 63: "Lorem ipsum"
+=======
+    RenderBody {BODY} at (8,8) size 784x576
+      RenderBlock {OL} at (0,0) size 784x38
+        RenderListItem {LI} at (40,0) size 744x19
+          RenderListMarker at (-21,0) size 16x19: "1"
+          RenderText {#text} at (0,0) size 156x19
+            text run at (0,0) width 156: "Make text bigger/smaller"
+        RenderListItem {LI} at (40,19) size 744x19
+          RenderListMarker at (-21,0) size 16x19: "2"
+          RenderText {#text} at (0,0) size 216x19
+            text run at (0,0) width 216: "Make the window narrower/wider"
+layer at (8,62) size 130x25
+  RenderBlock (positioned) {DIV} at (8,62) size 130x25 [border: (3px solid #000000)]
+    RenderText {#text} at (43,3) size 84x19
+      text run at (43,3) width 84: "Lorem ipsum"
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d