tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / fast / repaint / repaint-during-scroll-expected.txt

diff --git a/LayoutTests/platform/efl/fast/repaint/repaint-during-scroll-expected.txt b/LayoutTests/platform/efl/fast/repaint/repaint-during-scroll-expected.txt
index 6859e63..6aa0fca 100755 (executable)
--- a/LayoutTests/platform/efl/fast/repaint/repaint-during-scroll-expected.txt
+++ b/LayoutTests/platform/efl/fast/repaint/repaint-during-scroll-expected.txt
@@ -1,7 +1,15 @@
+<<<<<<< HEAD
 layer at (0,0) size 800x1216
   RenderView at (0,0) size 800x600
 layer at (0,0) size 800x1216
   RenderBlock {HTML} at (0,0) size 800x1216
     RenderBody {BODY} at (8,8) size 784x1200
+=======
+layer at (0,0) size 785x1216
+  RenderView at (0,0) size 785x600
+layer at (0,0) size 785x1216
+  RenderBlock {HTML} at (0,0) size 785x1216
+    RenderBody {BODY} at (8,8) size 769x1200
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
 layer at (300,300) size 100x100
   RenderBlock (positioned) {DIV} at (300,300) size 100x100 [bgcolor=#008000]