tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / fast / writing-mode / margin-collapse-expected.txt

diff --git a/LayoutTests/platform/efl/fast/writing-mode/margin-collapse-expected.txt b/LayoutTests/platform/efl/fast/writing-mode/margin-collapse-expected.txt
index 95d0dca..ca9568a 100755 (executable)
--- a/LayoutTests/platform/efl/fast/writing-mode/margin-collapse-expected.txt
+++ b/LayoutTests/platform/efl/fast/writing-mode/margin-collapse-expected.txt
@@ -3,8 +3,16 @@ 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 {DIV} at (0,0) size 784x524 [border: (2px solid #000000)]
         RenderBlock {DIV} at (14,26) size 100x100 [bgcolor=#008000]
         RenderBlock {DIV} at (14,150) size 100x100 [bgcolor=#008000]
         RenderBlock {DIV} at (14,274) size 100x100 [bgcolor=#008000]
         RenderBlock {DIV} at (14,398) size 100x100 [bgcolor=#008000]
+=======
+      RenderBlock {DIV} at (0,0) size 784x564 [border: (2px solid #000000)]
+        RenderBlock {DIV} at (18,34) size 100x100 [bgcolor=#008000]
+        RenderBlock {DIV} at (18,166) size 100x100 [bgcolor=#008000]
+        RenderBlock {DIV} at (18,298) size 100x100 [bgcolor=#008000]
+        RenderBlock {DIV} at (18,430) size 100x100 [bgcolor=#008000]
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d