tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / fast / text / whitespace / 015-expected.txt

diff --git a/LayoutTests/platform/efl/fast/text/whitespace/015-expected.txt b/LayoutTests/platform/efl/fast/text/whitespace/015-expected.txt
index 5eb6b8b..c48d088 100755 (executable)
--- a/LayoutTests/platform/efl/fast/text/whitespace/015-expected.txt
+++ b/LayoutTests/platform/efl/fast/text/whitespace/015-expected.txt
@@ -1,5 +1,6 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
+<<<<<<< HEAD
 layer at (0,0) size 800x172
   RenderBlock {HTML} at (0,0) size 800x172
     RenderBody {BODY} at (8,8) size 784x156
@@ -12,6 +13,20 @@ layer at (0,0) size 800x172
         RenderText {#text} at (0,0) size 328x14
           text run at (0,0) width 328: "There should be no red below, only a green square bordered in green."
       RenderTable {TABLE} at (0,52) size 104x104
+=======
+layer at (0,0) size 800x190
+  RenderBlock {HTML} at (0,0) size 800x190
+    RenderBody {BODY} at (8,8) size 784x174
+      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 439x19
+          text run at (0,0) width 439: "There should be no red below, only a green square bordered in green."
+      RenderTable {TABLE} at (0,70) size 104x104
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
         RenderTableSection {TBODY} at (0,0) size 104x104
           RenderTableRow {TR} at (0,2) size 104x100
             RenderTableCell {TD} at (2,2) size 100x100 [color=#800000] [bgcolor=#FF0000] [r=0 c=0 rs=1 cs=1]