tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / fast / media / mq-pixel-ratio-expected.txt

diff --git a/LayoutTests/platform/efl/fast/media/mq-pixel-ratio-expected.txt b/LayoutTests/platform/efl/fast/media/mq-pixel-ratio-expected.txt
index 6eee810..32251a8 100755 (executable)
--- a/LayoutTests/platform/efl/fast/media/mq-pixel-ratio-expected.txt
+++ b/LayoutTests/platform/efl/fast/media/mq-pixel-ratio-expected.txt
@@ -2,7 +2,15 @@ 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 695x14
           text run at (0,0) width 695: "This text should be green if the resolution scaling factor is 1.0, purple if the scaling factor is 1.5, red if the scaling factor is 2.0, and black otherwise."
+=======
+    RenderBody {BODY} at (8,8) size 784x576
+      RenderBlock {P} at (0,0) size 784x38 [color=#008000]
+        RenderText {#text} at (0,0) size 763x38
+          text run at (0,0) width 763: "This text should be green if the resolution scaling factor is 1.0, purple if the scaling factor is 1.5, red if the scaling factor is"
+          text run at (0,19) width 158: "2.0, and black otherwise."
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d