tizen beta release

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

diff --git a/LayoutTests/platform/efl/fast/block/margin-collapse/030-expected.txt b/LayoutTests/platform/efl/fast/block/margin-collapse/030-expected.txt
index c1ac9e8..8885fcf 100755 (executable)
--- a/LayoutTests/platform/efl/fast/block/margin-collapse/030-expected.txt
+++ b/LayoutTests/platform/efl/fast/block/margin-collapse/030-expected.txt
@@ -1,5 +1,6 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
+<<<<<<< HEAD
 layer at (0,0) size 800x98
   RenderBlock {HTML} at (0,0) size 800x98
     RenderBody {BODY} at (8,8) size 784x82
@@ -16,3 +17,21 @@ layer at (0,0) size 800x98
           RenderText {#text} at (0,0) size 60x12
             text run at (0,0) width 60: "XXXXX"
         RenderBlock {P} at (3,15) size 60x12 [bgcolor=#00FF00]
+=======
+layer at (0,0) size 800x124
+  RenderBlock {HTML} at (0,0) size 800x124
+    RenderBody {BODY} at (8,8) size 784x108
+      RenderBlock (anonymous) at (0,0) size 784x19
+        RenderInline {DIV} at (0,0) size 528x17 [color=#FFFFFF] [bgcolor=#FF0000]
+          RenderText {#text} at (0,2) size 528x17
+            text run at (0,2) width 528: "Ahem_font_required_for_this_test."
+        RenderText {#text} at (0,0) size 0x0
+      RenderBlock {P} at (0,35) size 784x19
+        RenderText {#text} at (0,0) size 193x19
+          text run at (0,0) width 193: "There should be no red below."
+      RenderBlock {DIV} at (0,70) size 86x38 [bgcolor=#FF0000] [border: (3px solid #000000)]
+        RenderBlock {P} at (3,3) size 80x0 [color=#00FF00]
+          RenderText {#text} at (0,0) size 80x17
+            text run at (0,0) width 80: "XXXXX"
+        RenderBlock {P} at (3,19) size 80x16 [bgcolor=#00FF00]
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d