tizen beta release

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

diff --git a/LayoutTests/platform/efl/css3/selectors3/xml/css3-modsel-16-expected.txt b/LayoutTests/platform/efl/css3/selectors3/xml/css3-modsel-16-expected.txt
index 6dfc701..2e75f60 100755 (executable)
--- a/LayoutTests/platform/efl/css3/selectors3/xml/css3-modsel-16-expected.txt
+++ b/LayoutTests/platform/efl/css3/selectors3/xml/css3-modsel-16-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 {test} at (0,0) size 800x38
     RenderBlock {p} at (0,12) size 800x14
@@ -8,3 +9,13 @@ layer at (0,0) size 800x38
           text run at (0,0) width 193: "This link should have green background."
       RenderText {#text} at (193,0) size 115x14
         text run at (193,0) width 115: " (Don't follow this link.)"
+=======
+layer at (0,0) size 800x51
+  RenderBlock {test} at (0,0) size 800x51
+    RenderBlock {p} at (0,16) size 800x19
+      RenderInline {a} at (0,0) size 258x19 [color=#0000EE] [bgcolor=#00FF00]
+        RenderText {#text} at (0,0) size 258x19
+          text run at (0,0) width 258: "This link should have green background."
+      RenderText {#text} at (258,0) size 152x19
+        text run at (258,0) width 152: " (Don't follow this link.)"
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d