tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / fast / dynamic / first-letter-display-change-expected.txt

diff --git a/LayoutTests/platform/efl/fast/dynamic/first-letter-display-change-expected.txt b/LayoutTests/platform/efl/fast/dynamic/first-letter-display-change-expected.txt
index 528efe9..8cb32bf 100755 (executable)
--- a/LayoutTests/platform/efl/fast/dynamic/first-letter-display-change-expected.txt
+++ b/LayoutTests/platform/efl/fast/dynamic/first-letter-display-change-expected.txt
@@ -3,9 +3,18 @@ layer at (0,0) size 800x600
 layer at (0,0) size 800x600
   RenderBlock {HTML} at (0,0) size 800x600
     RenderBody {BODY} at (8,8) size 784x584
+<<<<<<< HEAD
       RenderBlock {DIV} at (0,0) size 784x12
         RenderInline (generated) at (0,0) size 12x12 [color=#0000FF]
           RenderText {#text} at (0,0) size 12x12
             text run at (0,0) width 12: "L"
         RenderText {#text} at (12,0) size 300x12
           text run at (12,0) width 300: "orem ipsum dolor sit amet"
+=======
+      RenderBlock {DIV} at (0,0) size 784x17
+        RenderInline (generated) at (0,0) size 16x17 [color=#0000FF]
+          RenderText {#text} at (0,0) size 16x17
+            text run at (0,0) width 16: "L"
+        RenderText {#text} at (16,0) size 400x17
+          text run at (16,0) width 400: "orem ipsum dolor sit amet"
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d