tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / fast / block / positioning / vertical-lr / 001-expected.txt

diff --git a/LayoutTests/platform/efl/fast/block/positioning/vertical-lr/001-expected.txt b/LayoutTests/platform/efl/fast/block/positioning/vertical-lr/001-expected.txt
index bc23436..23618f7 100755 (executable)
--- a/LayoutTests/platform/efl/fast/block/positioning/vertical-lr/001-expected.txt
+++ b/LayoutTests/platform/efl/fast/block/positioning/vertical-lr/001-expected.txt
@@ -1,10 +1,19 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
+<<<<<<< HEAD
 layer at (0,0) size 26x600
   RenderBlock {HTML} at (0,0) size 26x600
     RenderBody {BODY} at (1,0) size 24x600 [bgcolor=#000000]
       RenderBlock {A} at (0,0) size 24x600 [color=#0000EE] [bgcolor=#008000]
         RenderText {#text} at (5,10) size 14x29
           text run at (5,10) width 29: "Home"
+=======
+layer at (0,0) size 31x600
+  RenderBlock {HTML} at (0,0) size 31x600
+    RenderBody {BODY} at (1,0) size 29x600 [bgcolor=#000000]
+      RenderBlock {A} at (0,0) size 29x600 [color=#0000EE] [bgcolor=#008000]
+        RenderText {#text} at (5,10) size 19x39
+          text run at (5,10) width 39: "Home"
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
 layer at (190,55) size 50x50
   RenderBlock (positioned) {DIV} at (190,55) size 50x50