tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / fast / media / mq-simple-neg-query-02-expected.txt

diff --git a/LayoutTests/platform/efl/fast/media/mq-simple-neg-query-02-expected.txt b/LayoutTests/platform/efl/fast/media/mq-simple-neg-query-02-expected.txt
index eb268df..546198a 100755 (executable)
--- a/LayoutTests/platform/efl/fast/media/mq-simple-neg-query-02-expected.txt
+++ b/LayoutTests/platform/efl/fast/media/mq-simple-neg-query-02-expected.txt
@@ -2,7 +2,14 @@ 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 122x14
           text run at (0,0) width 122: "This text should be green."
+=======
+    RenderBody {BODY} at (8,8) size 784x576
+      RenderBlock {P} at (0,0) size 784x19 [color=#008000]
+        RenderText {#text} at (0,0) size 163x19
+          text run at (0,0) width 163: "This text should be green."
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d