tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / fast / block / margin-collapse / 004-expected.txt

diff --git a/LayoutTests/platform/efl/fast/block/margin-collapse/004-expected.txt b/LayoutTests/platform/efl/fast/block/margin-collapse/004-expected.txt
index 12fbfb8..629595f 100755 (executable)
--- a/LayoutTests/platform/efl/fast/block/margin-collapse/004-expected.txt
+++ b/LayoutTests/platform/efl/fast/block/margin-collapse/004-expected.txt
@@ -1,5 +1,6 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
+<<<<<<< HEAD
 layer at (0,0) size 800x46
   RenderBlock {HTML} at (0,0) size 800x46
     RenderBody {BODY} at (8,12) size 784x86
@@ -9,3 +10,14 @@ layer at (0,0) size 800x46
       RenderBlock {DIV} at (0,26) size 60x60 [bgcolor=#FF0000]
       RenderBlock (floating) {DIV} at (0,26) size 60x60 [bgcolor=#008000]
         RenderBlock {DIV} at (30,60) size 0x0 [bgcolor=#FF0000]
+=======
+layer at (0,0) size 800x59
+  RenderBlock {HTML} at (0,0) size 800x59
+    RenderBody {BODY} at (8,16) size 784x115
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 367x19
+          text run at (0,0) width 367: "This page should have one square green block and no red."
+      RenderBlock {DIV} at (0,35) size 80x80 [bgcolor=#FF0000]
+      RenderBlock (floating) {DIV} at (0,35) size 80x80 [bgcolor=#008000]
+        RenderBlock {DIV} at (40,80) size 0x0 [bgcolor=#FF0000]
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d