tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / fast / media / mq-js-stylesheet-media-03-expected.txt

diff --git a/LayoutTests/platform/efl/fast/media/mq-js-stylesheet-media-03-expected.txt b/LayoutTests/platform/efl/fast/media/mq-js-stylesheet-media-03-expected.txt
index c0d1b9a..000a354 100755 (executable)
--- a/LayoutTests/platform/efl/fast/media/mq-js-stylesheet-media-03-expected.txt
+++ b/LayoutTests/platform/efl/fast/media/mq-js-stylesheet-media-03-expected.txt
@@ -2,6 +2,7 @@ layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
 layer at (0,0) size 800x600
   RenderBlock {HTML} at (0,0) size 800x600
+<<<<<<< HEAD
     RenderBody {BODY} at (8,8) size 784x580
       RenderBlock {P} at (0,0) size 784x14 [color=#008000]
         RenderText {#text} at (0,0) size 419x14
@@ -12,3 +13,15 @@ layer at (0,0) size 800x600
       RenderBlock {P} at (0,52) size 784x14 [color=#008000]
         RenderText {#text} at (0,0) size 136x14
           text run at (0,0) width 136: "expected to fail (24.07.2005)"
+=======
+    RenderBody {BODY} at (8,8) size 784x576
+      RenderBlock {P} at (0,0) size 784x19 [color=#008000]
+        RenderText {#text} at (0,0) size 560x19
+          text run at (0,0) width 560: "This text should be green and below should read \"braille, not screen, screen and (color)\"."
+      RenderBlock {P} at (0,35) size 784x19 [color=#008000]
+        RenderText {#text} at (0,0) size 304x19
+          text run at (0,0) width 304: "braille, not screen, screen and (color), not screen"
+      RenderBlock {P} at (0,70) size 784x19 [color=#008000]
+        RenderText {#text} at (0,0) size 182x19
+          text run at (0,0) width 182: "expected to fail (24.07.2005)"
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d