tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / fast / block / float / clamped-right-float-expected.txt

diff --git a/LayoutTests/platform/efl/fast/block/float/clamped-right-float-expected.txt b/LayoutTests/platform/efl/fast/block/float/clamped-right-float-expected.txt
index f0b4b70..f1d93e6 100755 (executable)
--- a/LayoutTests/platform/efl/fast/block/float/clamped-right-float-expected.txt
+++ b/LayoutTests/platform/efl/fast/block/float/clamped-right-float-expected.txt
@@ -4,5 +4,10 @@ layer at (0,0) size 800x108
   RenderBlock {HTML} at (0,0) size 800x108
     RenderBody {BODY} at (8,8) size 784x0
       RenderBlock (floating) {DIV} at (-4216,0) size 5000x100 [bgcolor=#66EEAA]
+<<<<<<< HEAD
         RenderText {#text} at (4785,0) size 215x14
           text run at (4785,0) width 215: "Element floated right with a width of 5000px."
+=======
+        RenderText {#text} at (4712,0) size 288x19
+          text run at (4712,0) width 288: "Element floated right with a width of 5000px."
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d