tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / fast / media / mq-width-absolute-02-expected.txt

diff --git a/LayoutTests/platform/efl/fast/media/mq-width-absolute-02-expected.txt b/LayoutTests/platform/efl/fast/media/mq-width-absolute-02-expected.txt
index a45d09d..3d364ac 100755 (executable)
--- a/LayoutTests/platform/efl/fast/media/mq-width-absolute-02-expected.txt
+++ b/LayoutTests/platform/efl/fast/media/mq-width-absolute-02-expected.txt
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 layer at (0,0) size 808x600
   RenderView at (0,0) size 800x600
 layer at (0,0) size 800x600
@@ -9,3 +10,16 @@ layer at (0,0) size 800x600
       RenderBlock {DIV} at (0,26) size 800x14 [bgcolor=#ADD8E6]
         RenderText {#text} at (0,0) size 91x14
           text run at (0,0) width 91: "div of width 800px"
+=======
+layer at (0,0) size 808x585
+  RenderView at (0,0) size 800x585
+layer at (0,0) size 800x585
+  RenderBlock {HTML} at (0,0) size 800x585
+    RenderBody {BODY} at (8,8) size 784x569
+      RenderBlock {P} at (0,0) size 784x19 [color=#008000]
+        RenderText {#text} at (0,0) size 378x19
+          text run at (0,0) width 378: "This text should be green if viewport is at most 800px wide."
+      RenderBlock {DIV} at (0,35) size 800x19 [bgcolor=#ADD8E6]
+        RenderText {#text} at (0,0) size 121x19
+          text run at (0,0) width 121: "div of width 800px"
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d