tizen beta release

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

diff --git a/LayoutTests/platform/efl/css3/selectors3/xhtml/css3-modsel-14e-expected.txt b/LayoutTests/platform/efl/css3/selectors3/xhtml/css3-modsel-14e-expected.txt
index 2370a90..54b17e8 100755 (executable)
--- a/LayoutTests/platform/efl/css3/selectors3/xhtml/css3-modsel-14e-expected.txt
+++ b/LayoutTests/platform/efl/css3/selectors3/xhtml/css3-modsel-14e-expected.txt
@@ -1,5 +1,6 @@
 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
     RenderBody {body} at (8,12) size 784x54
@@ -12,3 +13,17 @@ layer at (0,0) size 800x74
       RenderBlock {address} at (0,40) size 784x14 [color=#FFFFFF] [bgcolor=#008000]
         RenderText {#text} at (0,0) size 123x14
           text run at (0,0) width 123: "This line should be green."
+=======
+layer at (0,0) size 800x97
+  RenderBlock {html} at (0,0) size 800x97
+    RenderBody {body} at (8,16) size 784x73
+      RenderBlock {p} at (0,0) size 784x19 [color=#FFFFFF] [bgcolor=#008000]
+        RenderText {#text} at (0,0) size 163x19
+          text run at (0,0) width 163: "This line should be green."
+      RenderBlock {div} at (0,35) size 784x19 [color=#FFFFFF] [bgcolor=#008000]
+        RenderText {#text} at (0,0) size 163x19
+          text run at (0,0) width 163: "This line should be green."
+      RenderBlock {address} at (0,54) size 784x19 [color=#FFFFFF] [bgcolor=#008000]
+        RenderText {#text} at (0,0) size 163x19
+          text run at (0,0) width 163: "This line should be green."
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d