tizen beta release

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

diff --git a/LayoutTests/platform/efl/fast/css/empty-generated-content-expected.txt b/LayoutTests/platform/efl/fast/css/empty-generated-content-expected.txt
index f444b6f..c4a5cc1 100755 (executable)
--- a/LayoutTests/platform/efl/fast/css/empty-generated-content-expected.txt
+++ b/LayoutTests/platform/efl/fast/css/empty-generated-content-expected.txt
@@ -1,5 +1,6 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
+<<<<<<< HEAD
 layer at (0,0) size 800x30
   RenderBlock {HTML} at (0,0) size 800x30
     RenderBlock (anonymous) at (0,0) size 800x0
@@ -10,5 +11,17 @@ layer at (0,0) size 800x30
       RenderInline (generated) at (0,0) size 0x0
         RenderText at (0,0) size 0x0
     RenderBlock (anonymous) at (0,30) size 800x0
+=======
+layer at (0,0) size 800x35
+  RenderBlock {HTML} at (0,0) size 800x35
+    RenderBlock (anonymous) at (0,0) size 800x0
+      RenderText {#text} at (0,0) size 0x0
+    RenderBody {BODY} at (8,8) size 784x19
+      RenderText {#text} at (0,0) size 211x19
+        text run at (0,0) width 211: "This page intentionally left blank."
+      RenderInline (generated) at (0,0) size 0x0
+        RenderText at (0,0) size 0x0
+    RenderBlock (anonymous) at (0,35) size 800x0
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
       RenderInline (generated) at (0,0) size 0x0
         RenderText at (0,0) size 0x0