tizen beta release

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

diff --git a/LayoutTests/platform/efl/fast/block/margin-collapse/043-expected.txt b/LayoutTests/platform/efl/fast/block/margin-collapse/043-expected.txt
index 4ee5b75..e533128 100755 (executable)
--- a/LayoutTests/platform/efl/fast/block/margin-collapse/043-expected.txt
+++ b/LayoutTests/platform/efl/fast/block/margin-collapse/043-expected.txt
@@ -3,6 +3,7 @@ layer at (0,0) size 800x600
 layer at (0,0) size 800x600
   RenderBlock {HTML} at (0,0) size 800x600
     RenderBody {BODY} at (8,8) size 784x584 [color=#FFFFFF]
+<<<<<<< HEAD
       RenderBlock {DIV} at (0,0) size 784x27 [bgcolor=#008000] [border: (1px solid #000000) none]
         RenderBlock {P} at (0,0) size 784x14
           RenderText {#text} at (0,0) size 298x14
@@ -10,3 +11,12 @@ layer at (0,0) size 800x600
       RenderBlock {DIV} at (0,27) size 784x14 [bgcolor=#008000]
         RenderText {#text} at (0,0) size 300x14
           text run at (0,0) width 300: "I should also be green and flush with the other green div above."
+=======
+      RenderBlock {DIV} at (0,0) size 784x36 [bgcolor=#008000] [border: (1px solid #000000) none]
+        RenderBlock {P} at (0,0) size 784x19
+          RenderText {#text} at (0,0) size 400x19
+            text run at (0,0) width 400: "This div should be 2em tall with a 1em gap underneath the text."
+      RenderBlock {DIV} at (0,36) size 784x19 [bgcolor=#008000]
+        RenderText {#text} at (0,0) size 400x19
+          text run at (0,0) width 400: "I should also be green and flush with the other green div above."
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d