tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / fast / block / positioning / 060-expected.txt

diff --git a/LayoutTests/platform/efl/fast/block/positioning/060-expected.txt b/LayoutTests/platform/efl/fast/block/positioning/060-expected.txt
index 575de2b..0512f1b 100755 (executable)
--- a/LayoutTests/platform/efl/fast/block/positioning/060-expected.txt
+++ b/LayoutTests/platform/efl/fast/block/positioning/060-expected.txt
@@ -3,9 +3,15 @@ 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
       RenderText {#text} at (0,0) size 408x14
         text run at (0,0) width 248: "There should be two 100x100 green squares below. "
         text run at (248,0) width 160: "They should be vertically stacked."
+=======
+      RenderText {#text} at (0,0) size 546x19
+        text run at (0,0) width 331: "There should be two 100x100 green squares below. "
+        text run at (331,0) width 215: "They should be vertically stacked."
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
       RenderText {#text} at (0,0) size 0x0
 layer at (10,40) size 100x100
   RenderBlock (positioned) {DIV} at (10,40) size 100x100 [bgcolor=#008000]