tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / fast / forms / range / range-thumb-height-percentage-expected.txt

diff --git a/LayoutTests/platform/efl/fast/forms/range/range-thumb-height-percentage-expected.txt b/LayoutTests/platform/efl/fast/forms/range/range-thumb-height-percentage-expected.txt
index 277063a..2ecd116 100755 (executable)
--- a/LayoutTests/platform/efl/fast/forms/range/range-thumb-height-percentage-expected.txt
+++ b/LayoutTests/platform/efl/fast/forms/range/range-thumb-height-percentage-expected.txt
@@ -3,14 +3,25 @@ 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
+<<<<<<< HEAD
       RenderBlock {P} at (0,0) size 784x14
         RenderText {#text} at (0,0) size 402x14
           text run at (0,0) width 402: "The slider thumb below has a height specified as 50%. It should be a 10 pixel square."
       RenderBlock (anonymous) at (0,26) size 784x24
+=======
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 536x19
+          text run at (0,0) width 536: "The slider thumb below has a height specified as 50%. It should be a 10 pixel square."
+      RenderBlock (anonymous) at (0,35) size 784x24
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
         RenderSlider {INPUT} at (2,2) size 200x20 [bgcolor=#C0C0C0]
           RenderDeprecatedFlexibleBox {DIV} at (0,0) size 200x20
             RenderBlock {DIV} at (0,5) size 190x10
             RenderBlock {DIV} at (190,5) size 10x10 [bgcolor=#008000]
         RenderText {#text} at (0,0) size 0x0
+<<<<<<< HEAD
 layer at (105,41) size 10x10
+=======
+layer at (105,50) size 10x10
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
   RenderBlock (relative positioned) {DIV} at (0,0) size 10x10 [bgcolor=#008000]