tizen beta release

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

diff --git a/LayoutTests/platform/efl/css3/selectors3/xml/css3-modsel-35-expected.txt b/LayoutTests/platform/efl/css3/selectors3/xml/css3-modsel-35-expected.txt
index 5084e72..c41f18c 100755 (executable)
--- a/LayoutTests/platform/efl/css3/selectors3/xml/css3-modsel-35-expected.txt
+++ b/LayoutTests/platform/efl/css3/selectors3/xml/css3-modsel-35-expected.txt
@@ -1,5 +1,6 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
+<<<<<<< HEAD
 layer at (0,0) size 800x92
   RenderBlock {test} at (0,0) size 800x92
     RenderBlock {div} at (0,0) size 800x92
@@ -15,3 +16,20 @@ layer at (0,0) size 800x92
       RenderBlock (anonymous) at (0,78) size 800x14
         RenderText {#text} at (0,0) size 236x14
           text run at (0,0) width 236: "This div contains 3 addresses above this sentence."
+=======
+layer at (0,0) size 800x124
+  RenderBlock {test} at (0,0) size 800x124
+    RenderBlock {div} at (0,0) size 800x124
+      RenderBlock {address} at (16,0) size 784x19
+        RenderText {#text} at (0,0) size 252x19
+          text run at (0,0) width 252: "A first address with normal background"
+      RenderBlock {address} at (16,35) size 784x19
+        RenderText {#text} at (0,0) size 272x19
+          text run at (0,0) width 272: "A second address with normal background"
+      RenderBlock {address} at (16,70) size 784x19 [bgcolor=#00FF00]
+        RenderText {#text} at (0,0) size 337x19
+          text run at (0,0) width 337: "A third address that should have a green background"
+      RenderBlock (anonymous) at (0,105) size 800x19
+        RenderText {#text} at (0,0) size 314x19
+          text run at (0,0) width 314: "This div contains 3 addresses above this sentence."
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d