tizen beta release

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

diff --git a/LayoutTests/platform/efl/fast/block/margin-collapse/block-inside-inline/020-expected.txt b/LayoutTests/platform/efl/fast/block/margin-collapse/block-inside-inline/020-expected.txt
index d4af2d8..f1275b9 100755 (executable)
--- a/LayoutTests/platform/efl/fast/block/margin-collapse/block-inside-inline/020-expected.txt
+++ b/LayoutTests/platform/efl/fast/block/margin-collapse/block-inside-inline/020-expected.txt
@@ -1,5 +1,6 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
+<<<<<<< HEAD
 layer at (0,0) size 800x232
   RenderBlock {HTML} at (0,0) size 800x232
     RenderBody {BODY} at (8,12) size 784x208
@@ -7,6 +8,15 @@ layer at (0,0) size 800x232
         RenderText {#text} at (0,0) size 172x14
           text run at (0,0) width 172: "There should be no red on this page."
       RenderTable {TABLE} at (0,26) size 156x156 [bgcolor=#FF0000] [border: (3px solid #000000)]
+=======
+layer at (0,0) size 800x258
+  RenderBlock {HTML} at (0,0) size 800x258
+    RenderBody {BODY} at (8,16) size 784x226
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 230x19
+          text run at (0,0) width 230: "There should be no red on this page."
+      RenderTable {TABLE} at (0,35) size 156x156 [bgcolor=#FF0000] [border: (3px solid #000000)]
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
         RenderTableSection {TBODY} at (3,3) size 150x150
           RenderTableRow {TR} at (0,0) size 150x150
             RenderTableCell {TD} at (0,0) size 50x150 [r=0 c=0 rs=1 cs=1]
@@ -72,6 +82,7 @@ layer at (0,0) size 800x232
               RenderBlock (anonymous) at (0,150) size 50x0
                 RenderInline {SPAN} at (0,0) size 0x0
                 RenderText {#text} at (0,0) size 0x0
+<<<<<<< HEAD
       RenderBlock {P} at (0,194) size 784x14
         RenderText {#text} at (0,0) size 45x14
           text run at (0,0) width 45: "See also: "
@@ -80,3 +91,13 @@ layer at (0,0) size 800x232
             text run at (45,0) width 55: "prerequisite"
         RenderText {#text} at (100,0) size 3x14
           text run at (100,0) width 3: "."
+=======
+      RenderBlock {P} at (0,207) size 784x19
+        RenderText {#text} at (0,0) size 60x19
+          text run at (0,0) width 60: "See also: "
+        RenderInline {A} at (0,0) size 73x19 [color=#0000EE]
+          RenderText {#text} at (60,0) size 73x19
+            text run at (60,0) width 73: "prerequisite"
+        RenderText {#text} at (133,0) size 4x19
+          text run at (133,0) width 4: "."
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d