tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / css3 / selectors3 / xml / css3-modsel-153-expected.txt

diff --git a/LayoutTests/platform/efl/css3/selectors3/xml/css3-modsel-153-expected.txt b/LayoutTests/platform/efl/css3/selectors3/xml/css3-modsel-153-expected.txt
index 7bbcdb8..6a3e0c2 100755 (executable)
--- a/LayoutTests/platform/efl/css3/selectors3/xml/css3-modsel-153-expected.txt
+++ b/LayoutTests/platform/efl/css3/selectors3/xml/css3-modsel-153-expected.txt
@@ -1,5 +1,6 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
+<<<<<<< HEAD
 layer at (0,0) size 800x52
   RenderBlock {test} at (0,0) size 800x52
     RenderBlock {address} at (0,0) size 800x12 [bgcolor=#00FF00]
@@ -9,3 +10,14 @@ layer at (0,0) size 800x52
     RenderBlock {p} at (0,26) size 800x14
       RenderText {#text} at (0,0) size 226x14
         text run at (0,0) width 226: "(Note: This test is based on unpublished errata.)"
+=======
+layer at (0,0) size 800x70
+  RenderBlock {test} at (0,0) size 800x70
+    RenderBlock {address} at (0,0) size 800x16 [bgcolor=#00FF00]
+    RenderBlock {div} at (0,0) size 800x19
+      RenderText {#text} at (0,0) size 268x19
+        text run at (0,0) width 268: "This line should have a green background."
+    RenderBlock {p} at (0,35) size 800x19
+      RenderText {#text} at (0,0) size 300x19
+        text run at (0,0) width 300: "(Note: This test is based on unpublished errata.)"
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d