tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / fast / replaced / vertical-lr / absolute-position-with-auto-height-and-top-and-bottom-expected.txt

diff --git a/LayoutTests/platform/efl/fast/replaced/vertical-lr/absolute-position-with-auto-height-and-top-and-bottom-expected.txt b/LayoutTests/platform/efl/fast/replaced/vertical-lr/absolute-position-with-auto-height-and-top-and-bottom-expected.txt
index 9898b53..117d1dd 100755 (executable)
--- a/LayoutTests/platform/efl/fast/replaced/vertical-lr/absolute-position-with-auto-height-and-top-and-bottom-expected.txt
+++ b/LayoutTests/platform/efl/fast/replaced/vertical-lr/absolute-position-with-auto-height-and-top-and-bottom-expected.txt
@@ -3,10 +3,20 @@ 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 14x584
         RenderText {#text} at (0,0) size 14x479
           text run at (0,0) width 479: "The blue box should be vertically centered in the black box with 25px of white on the top and bottom."
 layer at (34,8) size 104x154
   RenderBlock (relative positioned) {DIV} at (26,0) size 104x154 [border: (2px solid #000000)]
 layer at (36,35) size 100x100
+=======
+      RenderBlock {P} at (0,0) size 38x584
+        RenderText {#text} at (0,0) size 38x564
+          text run at (0,0) width 564: "The blue box should be vertically centered in the black box with 25px of white on the top"
+          text run at (19,0) width 75: "and bottom."
+layer at (62,8) size 104x154
+  RenderBlock (relative positioned) {DIV} at (54,0) size 104x154 [border: (2px solid #000000)]
+layer at (64,35) size 100x100
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
   RenderImage {IMG} at (2,27) size 100x100