tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / printing / return-from-printing-mode-expected.txt

diff --git a/LayoutTests/platform/efl/printing/return-from-printing-mode-expected.txt b/LayoutTests/platform/efl/printing/return-from-printing-mode-expected.txt
index b48c67c..80567b9 100755 (executable)
--- a/LayoutTests/platform/efl/printing/return-from-printing-mode-expected.txt
+++ b/LayoutTests/platform/efl/printing/return-from-printing-mode-expected.txt
@@ -1,8 +1,17 @@
+<<<<<<< HEAD
 layer at (0,0) size 1656x600
   RenderView at (0,0) size 800x600
+=======
+layer at (0,0) size 1656x585
+  RenderView at (0,0) size 800x585
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
 layer at (0,0) size 800x48
   RenderBlock {HTML} at (0,0) size 800x48
     RenderBody {BODY} at (8,16) size 784x16
       RenderBlock {P} at (0,0) size 784x16
+<<<<<<< HEAD
         RenderText {#text} at (0,0) size 1648x16
+=======
+        RenderText {#text} at (0,0) size 1648x17
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
           text run at (0,0) width 1648: "The_content_of_this_paragraph_must_be_long_enough_such_that_a_scroll_bar_is_shown_in_non_printing_mode."