tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / fast / css-generated-content / visibleContentHiddenParent-expected.txt

diff --git a/LayoutTests/platform/efl/fast/css-generated-content/visibleContentHiddenParent-expected.txt b/LayoutTests/platform/efl/fast/css-generated-content/visibleContentHiddenParent-expected.txt
index 0a21651..c9962f0 100755 (executable)
--- a/LayoutTests/platform/efl/fast/css-generated-content/visibleContentHiddenParent-expected.txt
+++ b/LayoutTests/platform/efl/fast/css-generated-content/visibleContentHiddenParent-expected.txt
@@ -3,10 +3,19 @@ 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
       RenderInline {A} at (0,0) size 410x14
         RenderInline (generated) at (0,0) size 269x14
           RenderText at (0,0) size 269x14
             text run at (0,0) width 269: "This test passes if it does not crash, and this text appears."
         RenderText {#text} at (269,0) size 141x14
           text run at (269,0) width 141: "But it fails if this text appears."
+=======
+      RenderInline {A} at (0,0) size 543x19
+        RenderInline (generated) at (0,0) size 356x19
+          RenderText at (0,0) size 356x19
+            text run at (0,0) width 356: "This test passes if it does not crash, and this text appears."
+        RenderText {#text} at (356,0) size 187x19
+          text run at (356,0) width 187: "But it fails if this text appears."
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
       RenderText {#text} at (0,0) size 0x0