tizen beta release

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

diff --git a/LayoutTests/platform/efl/fast/flexbox/015-expected.txt b/LayoutTests/platform/efl/fast/flexbox/015-expected.txt
index 9eee055..35dbbe5 100755 (executable)
--- a/LayoutTests/platform/efl/fast/flexbox/015-expected.txt
+++ b/LayoutTests/platform/efl/fast/flexbox/015-expected.txt
@@ -3,10 +3,17 @@ 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 457x14
           text run at (0,0) width 457: "You should see a single 100x100 green square below. If you see any red, then the test has failed."
       RenderDeprecatedFlexibleBox {DIV} at (0,26) size 300x100
+=======
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 609x19
+          text run at (0,0) width 609: "You should see a single 100x100 green square below. If you see any red, then the test has failed."
+      RenderDeprecatedFlexibleBox {DIV} at (0,35) size 300x100
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
         RenderDeprecatedFlexibleBox {DIV} at (0,0) size 100x100 [bgcolor=#FF0000]
           RenderDeprecatedFlexibleBox {DIV} at (0,0) size 0x100
           RenderBlock {DIV} at (0,0) size 100x100 [bgcolor=#008000]