tizen beta release

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

diff --git a/LayoutTests/platform/efl/css3/selectors3/html/css3-modsel-82-expected.txt b/LayoutTests/platform/efl/css3/selectors3/html/css3-modsel-82-expected.txt
index 0a79bbf..4775d5f 100755 (executable)
--- a/LayoutTests/platform/efl/css3/selectors3/html/css3-modsel-82-expected.txt
+++ b/LayoutTests/platform/efl/css3/selectors3/html/css3-modsel-82-expected.txt
@@ -1,5 +1,6 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
+<<<<<<< HEAD
 layer at (0,0) size 800x90
   RenderBlock {HTML} at (0,0) size 800x90
     RenderBody {BODY} at (8,12) size 784x66
@@ -13,3 +14,18 @@ layer at (0,0) size 800x90
         RenderBlock {P} at (0,52) size 784x14 [bgcolor=#00FF00]
           RenderText {#text} at (0,0) size 222x14
             text run at (0,0) width 222: "This paragraph should have green background."
+=======
+layer at (0,0) size 800x121
+  RenderBlock {HTML} at (0,0) size 800x121
+    RenderBody {BODY} at (8,16) size 784x89
+      RenderBlock {DIV} at (0,0) size 784x89
+        RenderBlock {P} at (0,0) size 784x19 [bgcolor=#00FF00]
+          RenderText {#text} at (0,0) size 297x19
+            text run at (0,0) width 297: "This paragraph should have green background."
+        RenderBlock {ADDRESS} at (0,35) size 784x19
+          RenderText {#text} at (0,0) size 226x19
+            text run at (0,0) width 226: "But this address should be unstyled."
+        RenderBlock {P} at (0,70) size 784x19 [bgcolor=#00FF00]
+          RenderText {#text} at (0,0) size 297x19
+            text run at (0,0) width 297: "This paragraph should have green background."
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d