tizen beta release

[profile/ivi/webkit-efl.git] / LayoutTests / platform / efl / fast / repaint / lines-with-layout-delta-expected.txt

diff --git a/LayoutTests/platform/efl/fast/repaint/lines-with-layout-delta-expected.txt b/LayoutTests/platform/efl/fast/repaint/lines-with-layout-delta-expected.txt
index 03a8998..e44b756 100755 (executable)
--- a/LayoutTests/platform/efl/fast/repaint/lines-with-layout-delta-expected.txt
+++ b/LayoutTests/platform/efl/fast/repaint/lines-with-layout-delta-expected.txt
@@ -5,7 +5,14 @@ layer at (0,0) size 800x600
     RenderBody {BODY} at (8,8) size 784x584
       RenderBlock (floating) {DIV} at (0,0) size 50x50
       RenderBlock {DIV} at (0,50) size 784x0
+<<<<<<< HEAD
 layer at (8,58) size 200x14
   RenderBlock (floating) {DIV} at (0,0) size 200x14
     RenderText {#text} at (0,0) size 30x14
       text run at (0,0) width 30: "PASS"
+=======
+layer at (8,58) size 200x19
+  RenderBlock (floating) {DIV} at (0,0) size 200x19
+    RenderText {#text} at (0,0) size 39x19
+      text run at (0,0) width 39: "PASS"
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d