tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / css2.1 / t1204-root-e-expected.txt

diff --git a/LayoutTests/platform/efl/css2.1/t1204-root-e-expected.txt b/LayoutTests/platform/efl/css2.1/t1204-root-e-expected.txt
index 0e5f1df..bd3ca3c 100755 (executable)
--- a/LayoutTests/platform/efl/css2.1/t1204-root-e-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t1204-root-e-expected.txt
@@ -1,11 +1,17 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
+<<<<<<< HEAD
 layer at (0,0) size 800x74
   RenderBlock {HTML} at (0,0) size 800x74
+=======
+layer at (0,0) size 800x97
+  RenderBlock {HTML} at (0,0) size 800x97
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
     RenderBlock (anonymous) at (0,0) size 800x0
       RenderInline (generated) at (0,0) size 0x0
         RenderText at (0,0) size 0x0
       RenderText {#text} at (0,0) size 0x0
+<<<<<<< HEAD
     RenderBody {BODY} at (8,12) size 784x54
       RenderBlock {P} at (0,0) size 784x14
         RenderText {#text} at (0,0) size 161x14
@@ -19,3 +25,18 @@ layer at (0,0) size 800x74
       RenderBlock {DIV} at (0,40) size 784x14
         RenderText {#text} at (0,0) size 15x14
           text run at (0,0) width 15: "4.8"
+=======
+    RenderBody {BODY} at (8,16) size 784x73
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 216x19
+          text run at (0,0) width 216: "The following should be identical:"
+      RenderBlock {DIV} at (0,35) size 784x19
+        RenderInline {SPAN} at (0,0) size 20x19
+          RenderInline (generated) at (0,0) size 20x19
+            RenderCounter at (0,0) size 20x19
+              text run at (0,0) width 20: "4.8"
+        RenderText {#text} at (0,0) size 0x0
+      RenderBlock {DIV} at (0,54) size 784x19
+        RenderText {#text} at (0,0) size 20x19
+          text run at (0,0) width 20: "4.8"
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d