tizen beta release

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

diff --git a/LayoutTests/platform/efl/css3/selectors3/xhtml/css3-modsel-179-expected.txt b/LayoutTests/platform/efl/css3/selectors3/xhtml/css3-modsel-179-expected.txt
index bdf95d3..8d4217e 100755 (executable)
--- a/LayoutTests/platform/efl/css3/selectors3/xhtml/css3-modsel-179-expected.txt
+++ b/LayoutTests/platform/efl/css3/selectors3/xhtml/css3-modsel-179-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
@@ -7,3 +8,12 @@ layer at (0,0) size 800x38
         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 800x51
+  RenderBlock {html} at (0,0) size 800x51
+    RenderBody {body} at (8,16) size 784x19
+      RenderBlock {p} at (0,0) size 784x19 [color=#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