tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / fast / multicol / border-padding-pagination-expected.txt

diff --git a/LayoutTests/platform/efl/fast/multicol/border-padding-pagination-expected.txt b/LayoutTests/platform/efl/fast/multicol/border-padding-pagination-expected.txt
index 727c9fe..7decefa 100755 (executable)
--- a/LayoutTests/platform/efl/fast/multicol/border-padding-pagination-expected.txt
+++ b/LayoutTests/platform/efl/fast/multicol/border-padding-pagination-expected.txt
@@ -5,11 +5,19 @@ layer at (0,0) size 800x600
     RenderBody {BODY} at (8,8) size 784x584
 layer at (8,8) size 784x176
   RenderBlock {DIV} at (0,0) size 784x176 [border: (2px solid #800000)]
+<<<<<<< HEAD
     RenderBlock {DIV} at (2,2) size 384x110
     RenderBlock {DIV} at (2,174) size 379x156 [bgcolor=#00FF00] [border: (2px solid #000000)]
       RenderBlock {DIV} at (12,2) size 355x152 [bgcolor=#008000] [border: (2px solid #0000FF)]
         RenderInline {SPAN} at (0,0) size 192x145
           RenderText {#text} at (2,3) size 192x145
+=======
+    RenderBlock {DIV} at (2,2) size 382x110
+    RenderBlock {DIV} at (2,174) size 379x156 [bgcolor=#00FF00] [border: (2px solid #000000)]
+      RenderBlock {DIV} at (12,2) size 355x152 [bgcolor=#008000] [border: (2px solid #0000FF)]
+        RenderInline {SPAN} at (0,0) size 192x146
+          RenderText {#text} at (2,3) size 192x146
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
             text run at (2,3) width 165: "In 2nd"
             text run at (2,77) width 192: "column"
         RenderText {#text} at (0,0) size 0x0