tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / fast / replaced / minheight-pxs-expected.txt

diff --git a/LayoutTests/platform/efl/fast/replaced/minheight-pxs-expected.txt b/LayoutTests/platform/efl/fast/replaced/minheight-pxs-expected.txt
index aa7a2da..26693aa 100755 (executable)
--- a/LayoutTests/platform/efl/fast/replaced/minheight-pxs-expected.txt
+++ b/LayoutTests/platform/efl/fast/replaced/minheight-pxs-expected.txt
@@ -3,6 +3,7 @@ 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 347x14
           text run at (0,0) width 347: "In this test you should see two identical blue squares, each 50px by 50px."
@@ -11,4 +12,14 @@ layer at (0,0) size 800x600
         RenderText {#text} at (50,39) size 3x14
           text run at (50,39) width 3: " "
         RenderImage {IMG} at (53,0) size 50x50
+=======
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 462x19
+          text run at (0,0) width 462: "In this test you should see two identical blue squares, each 50px by 50px."
+      RenderBlock (anonymous) at (0,35) size 784x54
+        RenderImage {IMG} at (0,0) size 50x50
+        RenderText {#text} at (50,35) size 4x19
+          text run at (50,35) width 4: " "
+        RenderImage {IMG} at (54,0) size 50x50
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
         RenderText {#text} at (0,0) size 0x0