tizen beta release

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

diff --git a/LayoutTests/platform/efl/css3/selectors3/html/css3-modsel-44c-expected.txt b/LayoutTests/platform/efl/css3/selectors3/html/css3-modsel-44c-expected.txt
index 4963ee7..cbf185d 100755 (executable)
--- a/LayoutTests/platform/efl/css3/selectors3/html/css3-modsel-44c-expected.txt
+++ b/LayoutTests/platform/efl/css3/selectors3/html/css3-modsel-44c-expected.txt
@@ -1,5 +1,6 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
+<<<<<<< HEAD
 layer at (0,0) size 800x44
   RenderBlock {HTML} at (0,0) size 800x44
     RenderBody {BODY} at (8,8) size 784x28
@@ -9,3 +10,14 @@ layer at (0,0) size 800x44
       RenderBlock {DIV} at (0,14) size 784x14 [color=#FFFFFF] [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 800x54
+  RenderBlock {HTML} at (0,0) size 800x54
+    RenderBody {BODY} at (8,8) size 784x38
+      RenderBlock {DIV} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 154x19
+          text run at (0,0) width 154: "This should be unstyled."
+      RenderBlock {DIV} at (0,19) size 784x19 [color=#FFFFFF] [bgcolor=#008000]
+        RenderText {#text} at (0,0) size 241x19
+          text run at (0,0) width 241: "This should have a green background."
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d