X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=LayoutTests%2Fplatform%2Fefl%2Ffast%2Ftext%2Fwhitespace%2F006-expected.txt;h=1ba9d067b1e8300abaff0334fa6126bc4e1e068d;hb=b96e33af77ac7d81a666d5aa202235b793aeeb21;hp=ddba75bb27a6dcfc8fabb59d48cf9ad191bdb731;hpb=2632619e54bc9f41ccea7c574710fe213e49212d;p=framework%2Fweb%2Fwebkit-efl.git

diff --git a/LayoutTests/platform/efl/fast/text/whitespace/006-expected.txt b/LayoutTests/platform/efl/fast/text/whitespace/006-expected.txt
index ddba75b..1ba9d06 100755
--- a/LayoutTests/platform/efl/fast/text/whitespace/006-expected.txt
+++ b/LayoutTests/platform/efl/fast/text/whitespace/006-expected.txt
@@ -1,5 +1,6 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
+<<<<<<< HEAD
 layer at (0,0) size 800x188
   RenderBlock {HTML} at (0,0) size 800x188
     RenderBody {BODY} at (8,8) size 784x160
@@ -12,6 +13,20 @@ layer at (0,0) size 800x188
         RenderText {#text} at (0,0) size 369x14
           text run at (0,0) width 369: "There should be no red below, only three identical striped green and lime bars."
       RenderBlock {DIV} at (20,60) size 744x20
+=======
+layer at (0,0) size 800x202
+  RenderBlock {HTML} at (0,0) size 800x202
+    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 (16,2) size 528x17
+            text run at (16,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 494x19
+          text run at (0,0) width 494: "There should be no red below, only three identical striped green and lime bars."
+      RenderBlock {DIV} at (20,74) size 744x20
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
         RenderInline {SPAN} at (0,0) size 220x20 [color=#800000] [bgcolor=#FF0000]
           RenderText {#text} at (0,0) size 0x0
           RenderInline {SPAN} at (0,0) size 220x20 [color=#008000] [bgcolor=#00FF00]
@@ -56,7 +71,11 @@ layer at (0,0) size 800x188
                 text run at (200,0) width 20: "X"
               RenderInline {SPAN} at (0,0) size 0x0 [color=#800000] [bgcolor=#FF0000]
                 RenderText {#text} at (0,0) size 0x0
+<<<<<<< HEAD
       RenderBlock {DIV} at (20,100) size 744x20
+=======
+      RenderBlock {DIV} at (20,114) size 744x20
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
         RenderInline {SPAN} at (0,0) size 220x20 [color=#800000] [bgcolor=#FF0000]
           RenderText {#text} at (0,0) size 0x0
           RenderInline {SPAN} at (0,0) size 220x20 [color=#008000] [bgcolor=#00FF00]
@@ -101,7 +120,11 @@ layer at (0,0) size 800x188
                 text run at (200,0) width 20: "X"
               RenderInline {SPAN} at (0,0) size 0x0 [color=#800000] [bgcolor=#FF0000]
                 RenderText {#text} at (0,0) size 0x0
+<<<<<<< HEAD
       RenderBlock {DIV} at (20,140) size 744x20
+=======
+      RenderBlock {DIV} at (20,154) size 744x20
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
         RenderInline {SPAN} at (0,0) size 220x20 [color=#008000] [bgcolor=#00FF00]
           RenderText {#text} at (0,0) size 220x20
             text run at (0,0) width 220: "X X X X X X"