tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / fast / media / mq-relative-constraints-08-expected.txt

diff --git a/LayoutTests/platform/efl/fast/media/mq-relative-constraints-08-expected.txt b/LayoutTests/platform/efl/fast/media/mq-relative-constraints-08-expected.txt
index 33efb79..4b96703 100755 (executable)
--- a/LayoutTests/platform/efl/fast/media/mq-relative-constraints-08-expected.txt
+++ b/LayoutTests/platform/efl/fast/media/mq-relative-constraints-08-expected.txt
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 layer at (0,0) size 800x634
   RenderView at (0,0) size 800x600
 layer at (0,0) size 800x634
@@ -12,3 +13,19 @@ layer at (0,0) size 800x634
       RenderBlock (floating) {DIV} at (86,26) size 93x600 [bgcolor=#ADD8E6]
         RenderText {#text} at (0,0) size 93x14
           text run at (0,0) width 93: "div of height 600px"
+=======
+layer at (0,0) size 785x643
+  RenderView at (0,0) size 785x600
+layer at (0,0) size 785x643
+  RenderBlock {HTML} at (0,0) size 785x643
+    RenderBody {BODY} at (8,8) size 769x576
+      RenderBlock {P} at (0,0) size 769x19 [color=#008000]
+        RenderText {#text} at (0,0) size 319x19
+          text run at (0,0) width 319: "This text should be green if height is at least 30ex ."
+      RenderBlock (floating) {DIV} at (0,35) size 115x240 [bgcolor=#ADD8E6]
+        RenderText {#text} at (0,0) size 115x19
+          text run at (0,0) width 115: "div of height 30ex"
+      RenderBlock (floating) {DIV} at (115,35) size 124x600 [bgcolor=#ADD8E6]
+        RenderText {#text} at (0,0) size 124x19
+          text run at (0,0) width 124: "div of height 600px"
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d