tizen beta release

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

diff --git a/LayoutTests/platform/efl/css3/selectors3/html/css3-modsel-181-expected.txt b/LayoutTests/platform/efl/css3/selectors3/html/css3-modsel-181-expected.txt
index 68df1ed..6893691 100755 (executable)
--- a/LayoutTests/platform/efl/css3/selectors3/html/css3-modsel-181-expected.txt
+++ b/LayoutTests/platform/efl/css3/selectors3/html/css3-modsel-181-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
@@ -15,3 +16,20 @@ layer at (0,0) size 800x90
             RenderInline {SPAN} at (0,0) size 122x14
               RenderText {#text} at (0,0) size 122x14
                 text run at (0,0) width 122: "This line should be green."
+=======
+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 {DIV} at (0,0) size 784x89 [color=#FF0000]
+          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 {P} 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 {P} at (0,70) size 784x19 [color=#FFFFFF] [bgcolor=#008000]
+            RenderInline {SPAN} at (0,0) size 163x19
+              RenderText {#text} at (0,0) size 163x19
+                text run at (0,0) width 163: "This line should be green."
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d