tizen beta release

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

diff --git a/LayoutTests/platform/efl/css3/selectors3/xhtml/css3-modsel-166-expected.txt b/LayoutTests/platform/efl/css3/selectors3/xhtml/css3-modsel-166-expected.txt
index 58dc625..716bdd0 100755 (executable)
--- a/LayoutTests/platform/efl/css3/selectors3/xhtml/css3-modsel-166-expected.txt
+++ b/LayoutTests/platform/efl/css3/selectors3/xhtml/css3-modsel-166-expected.txt
@@ -1,5 +1,6 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
+<<<<<<< HEAD
 layer at (0,0) size 800x38
   RenderBlock {html} at (0,0) size 800x38
     RenderBody {body} at (8,12) size 784x14
@@ -9,3 +10,14 @@ layer at (0,0) size 800x38
             text run at (0,0) width 7: "T"
         RenderText {#text} at (7,0) size 301x14
           text run at (7,0) width 301: "he first letter of this paragraph should have a green background."
+=======
+layer at (0,0) size 800x51
+  RenderBlock {html} at (0,0) size 800x51
+    RenderBody {body} at (8,16) size 784x19
+      RenderBlock {p} at (0,0) size 784x19
+        RenderInline (generated) at (0,0) size 10x19 [bgcolor=#00FF00]
+          RenderText {#text} at (0,0) size 10x19
+            text run at (0,0) width 10: "T"
+        RenderText {#text} at (10,0) size 401x19
+          text run at (10,0) width 401: "he first letter of this paragraph should have a green background."
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d