tizen beta release

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

diff --git a/LayoutTests/platform/efl/fast/block/lineboxcontain/inline-expected.txt b/LayoutTests/platform/efl/fast/block/lineboxcontain/inline-expected.txt
index 02d0e13..a2ecf71 100755 (executable)
--- a/LayoutTests/platform/efl/fast/block/lineboxcontain/inline-expected.txt
+++ b/LayoutTests/platform/efl/fast/block/lineboxcontain/inline-expected.txt
@@ -1,5 +1,6 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
+<<<<<<< HEAD
 layer at (0,0) size 800x223
   RenderBlock {HTML} at (0,0) size 800x223
     RenderBody {BODY} at (8,8) size 784x207
@@ -8,6 +9,16 @@ layer at (0,0) size 800x223
           text run at (0,0) width 194: "You should see a green rectangle below. "
           text run at (194,0) width 175: "If you see any red, the test has failed."
       RenderBlock {DIV} at (0,14) size 384x193 [bgcolor=#FF0000]
+=======
+layer at (0,0) size 800x228
+  RenderBlock {HTML} at (0,0) size 800x228
+    RenderBody {BODY} at (8,8) size 784x212
+      RenderBlock (anonymous) at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 493x19
+          text run at (0,0) width 260: "You should see a green rectangle below. "
+          text run at (260,0) width 233: "If you see any red, the test has failed."
+      RenderBlock {DIV} at (0,19) size 384x193 [bgcolor=#FF0000]
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
         RenderInline {SPAN} at (0,0) size 384x129 [bgcolor=#008000]
         RenderBR {BR} at (384,51) size 0x65
         RenderBlock {DIV} at (0,65) size 64x128 [bgcolor=#008000]