tizen beta release

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

diff --git a/LayoutTests/platform/efl/css3/selectors3/xml/css3-modsel-64-expected.txt b/LayoutTests/platform/efl/css3/selectors3/xml/css3-modsel-64-expected.txt
index 096261d..d3e2c0c 100755 (executable)
--- a/LayoutTests/platform/efl/css3/selectors3/xml/css3-modsel-64-expected.txt
+++ b/LayoutTests/platform/efl/css3/selectors3/xml/css3-modsel-64-expected.txt
@@ -1,5 +1,6 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
+<<<<<<< HEAD
 layer at (0,0) size 800x94
   RenderBlock {test} at (0,0) size 800x94
     RenderBlock {div} at (0,12) size 800x70
@@ -12,5 +13,19 @@ layer at (0,0) size 800x94
         RenderButton {button} at (2,2) size 342x40 [color=#000000] [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
           RenderBlock (anonymous) at (17,10) size 308x18
             RenderText {#text} at (0,0) size 308x17
+=======
+layer at (0,0) size 800x112
+  RenderBlock {test} at (0,0) size 800x112
+    RenderBlock {div} at (0,16) size 800x80
+      RenderBlock {p} at (0,0) size 800x19 [color=#00FF00]
+        RenderInline {a} at (0,0) size 279x19 [color=#000000]
+          RenderText {#text} at (0,0) size 279x19
+            text run at (0,0) width 279: "This text should turn green while it is active."
+        RenderText {#text} at (0,0) size 0x0
+      RenderBlock {p} at (0,35) size 800x45 [color=#00FF00]
+        RenderButton {button} at (2,2) size 342x41 [color=#000000] [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
+          RenderBlock (anonymous) at (17,10) size 308x19
+            RenderText {#text} at (0,0) size 308x19
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
               text run at (0,0) width 308: "This text should turn green while it is active."
         RenderText {#text} at (0,0) size 0x0