tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / fast / body-propagation / overflow / 006-declarative-expected.txt

diff --git a/LayoutTests/platform/efl/fast/body-propagation/overflow/006-declarative-expected.txt b/LayoutTests/platform/efl/fast/body-propagation/overflow/006-declarative-expected.txt
index 9462613..3e44928 100755 (executable)
--- a/LayoutTests/platform/efl/fast/body-propagation/overflow/006-declarative-expected.txt
+++ b/LayoutTests/platform/efl/fast/body-propagation/overflow/006-declarative-expected.txt
@@ -1,5 +1,6 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
+<<<<<<< HEAD
 layer at (0,0) size 800x168
   RenderBlock {html} at (0,0) size 800x168
     RenderBody {body} at (8,12) size 784x14 [color=#000080]
@@ -8,3 +9,13 @@ layer at (0,0) size 800x168
           text run at (0,0) width 323: "There should be scrollbars for the box below -- not for the viewport."
 layer at (8,38) size 122x122 clip at (9,39) size 120x120
   RenderBody {body} at (8,38) size 122x122 [color=#000080] [border: (1px solid #000080)]
+=======
+layer at (0,0) size 800x221
+  RenderBlock {html} at (0,0) size 800x221
+    RenderBody {body} at (8,16) size 784x19 [color=#000080]
+      RenderBlock {p} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 429x19
+          text run at (0,0) width 429: "There should be scrollbars for the box below -- not for the viewport."
+layer at (8,51) size 162x162 clip at (9,52) size 145x145
+  RenderBody {body} at (8,51) size 162x162 [color=#000080] [border: (1px solid #000080)]
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d