tizen beta release

[profile/ivi/webkit-efl.git] / LayoutTests / platform / efl / css3 / selectors3 / xml / css3-modsel-19-expected.txt

diff --git a/LayoutTests/platform/efl/css3/selectors3/xml/css3-modsel-19-expected.txt b/LayoutTests/platform/efl/css3/selectors3/xml/css3-modsel-19-expected.txt
index 922bd8b..9e03ded 100755 (executable)
--- a/LayoutTests/platform/efl/css3/selectors3/xml/css3-modsel-19-expected.txt
+++ b/LayoutTests/platform/efl/css3/selectors3/xml/css3-modsel-19-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
@@ -12,3 +13,17 @@ layer at (0,0) size 800x38
         text run at (169,0) width 3: " "
         text run at (172,0) width 276: "should turn to green when it is activated and come back to "
         text run at (448,0) width 126: "normal when it is released."
+=======
+layer at (0,0) size 800x51
+  RenderBlock {test} at (0,0) size 800x51
+    RenderBlock {p} at (0,16) size 800x19
+      RenderText {#text} at (0,0) size 161x19
+        text run at (0,0) width 161: "The background color of "
+      RenderInline {a} at (0,0) size 66x19 [color=#0000EE]
+        RenderText {#text} at (161,0) size 66x19
+          text run at (161,0) width 66: "the anchor"
+      RenderText {#text} at (227,0) size 542x19
+        text run at (227,0) width 4: " "
+        text run at (231,0) width 370: "should turn to green when it is activated and come back to "
+        text run at (601,0) width 168: "normal when it is released."
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d