tizen beta release

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

diff --git a/LayoutTests/platform/efl/css3/selectors3/xml/css3-modsel-44d-expected.txt b/LayoutTests/platform/efl/css3/selectors3/xml/css3-modsel-44d-expected.txt
index 9fcc8fc..025683c 100755 (executable)
--- a/LayoutTests/platform/efl/css3/selectors3/xml/css3-modsel-44d-expected.txt
+++ b/LayoutTests/platform/efl/css3/selectors3/xml/css3-modsel-44d-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 {div} at (0,0) size 800x14
@@ -8,3 +9,13 @@ layer at (0,0) size 800x52
     RenderBlock {p} at (0,26) size 800x14 [bgcolor=#008000]
       RenderText {#text} at (0,0) size 180x14
         text run at (0,0) width 180: "This should have a green background."
+=======
+layer at (0,0) size 800x70
+  RenderBlock {test} at (0,0) size 800x70
+    RenderBlock {div} at (0,0) size 800x19
+      RenderText {#text} at (0,0) size 154x19
+        text run at (0,0) width 154: "This should be unstyled."
+    RenderBlock {p} at (0,35) size 800x19 [bgcolor=#008000]
+      RenderText {#text} at (0,0) size 241x19
+        text run at (0,0) width 241: "This should have a green background."
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d