tizen beta release

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

diff --git a/LayoutTests/platform/efl/fast/flexbox/006-expected.txt b/LayoutTests/platform/efl/fast/flexbox/006-expected.txt
index 5cf407f..e355c24 100755 (executable)
--- a/LayoutTests/platform/efl/fast/flexbox/006-expected.txt
+++ b/LayoutTests/platform/efl/fast/flexbox/006-expected.txt
@@ -3,9 +3,18 @@ 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 (anonymous) at (0,0) size 784x14
         RenderText {#text} at (0,0) size 689x14
           text run at (0,0) width 491: "You should see a green rectangle below that is 100 pixels tall and that fills the width of the content area. "
           text run at (491,0) width 198: "If you see any red, then the test has failed."
       RenderBlock {DIV} at (0,14) size 784x100 [bgcolor=#FF0000]
+=======
+      RenderBlock (anonymous) at (0,0) size 784x38
+        RenderText {#text} at (0,0) size 774x38
+          text run at (0,0) width 657: "You should see a green rectangle below that is 100 pixels tall and that fills the width of the content area. "
+          text run at (657,0) width 117: "If you see any red,"
+          text run at (0,19) width 143: "then the test has failed."
+      RenderBlock {DIV} at (0,38) size 784x100 [bgcolor=#FF0000]
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
         RenderDeprecatedFlexibleBox {DIV} at (0,0) size 784x100 [bgcolor=#008000]