tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / fast / overflow / 005-expected.txt

diff --git a/LayoutTests/platform/efl/fast/overflow/005-expected.txt b/LayoutTests/platform/efl/fast/overflow/005-expected.txt
index 021b620..979450d 100755 (executable)
--- a/LayoutTests/platform/efl/fast/overflow/005-expected.txt
+++ b/LayoutTests/platform/efl/fast/overflow/005-expected.txt
@@ -2,6 +2,7 @@ layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
 layer at (0,0) size 800x600
   RenderBlock {HTML} at (0,0) size 800x600
+<<<<<<< HEAD
     RenderBody {BODY} at (8,8) size 784x582
 layer at (8,8) size 300x22
   RenderBlock {PRE} at (0,0) size 300x22
@@ -9,3 +10,12 @@ layer at (8,8) size 300x22
       text run at (0,0) width 234: "This is a test to see if this messes up"
       text run at (234,0) width 0: " "
       text run at (0,11) width 180: "the way I think it's going to."
+=======
+    RenderBody {BODY} at (8,8) size 784x579
+layer at (8,8) size 300x45 clip at (8,8) size 300x30 scrollWidth 312
+  RenderBlock {PRE} at (0,0) size 300x45
+    RenderText {#text} at (0,0) size 312x30
+      text run at (0,0) width 312: "This is a test to see if this messes up"
+      text run at (312,0) width 0: " "
+      text run at (0,15) width 240: "the way I think it's going to."
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d