tizen beta release

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

diff --git a/LayoutTests/platform/efl/css3/selectors3/xhtml/css3-modsel-49-expected.txt b/LayoutTests/platform/efl/css3/selectors3/xhtml/css3-modsel-49-expected.txt
index 2a7f661..a1ef413 100755 (executable)
--- a/LayoutTests/platform/efl/css3/selectors3/xhtml/css3-modsel-49-expected.txt
+++ b/LayoutTests/platform/efl/css3/selectors3/xhtml/css3-modsel-49-expected.txt
@@ -1,5 +1,6 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
+<<<<<<< HEAD
 layer at (0,0) size 800x112
   RenderBlock {html} at (0,0) size 800x112
     RenderBody {body} at (8,8) size 784x92
@@ -16,3 +17,21 @@ layer at (0,0) size 800x112
         RenderBlock {u} at (0,78) size 784x14 [bgcolor=#00FF00]
           RenderText {#text} at (0,0) size 227x14
             text run at (0,0) width 227: "This paragraph should have a green background"
+=======
+layer at (0,0) size 800x148
+  RenderBlock {html} at (0,0) size 800x148
+    RenderBody {body} at (8,8) size 784x124
+      RenderBlock {div} at (0,0) size 784x124
+        RenderBlock {address} at (0,0) size 784x19 [bgcolor=#00FF00]
+          RenderText {#text} at (0,0) size 292x19
+            text run at (0,0) width 292: "This address should have a green background"
+        RenderBlock {s} at (0,35) size 784x19 [bgcolor=#00FF00]
+          RenderText {#text} at (0,0) size 304x19
+            text run at (0,0) width 304: "This paragraph should have a green background"
+        RenderBlock {t} at (0,70) size 784x19 [bgcolor=#00FF00]
+          RenderText {#text} at (0,0) size 304x19
+            text run at (0,0) width 304: "This paragraph should have a green background"
+        RenderBlock {u} at (0,105) size 784x19 [bgcolor=#00FF00]
+          RenderText {#text} at (0,0) size 304x19
+            text run at (0,0) width 304: "This paragraph should have a green background"
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d