tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / fast / body-propagation / background-color / 003-xhtml-expected.txt

diff --git a/LayoutTests/platform/efl/fast/body-propagation/background-color/003-xhtml-expected.txt b/LayoutTests/platform/efl/fast/body-propagation/background-color/003-xhtml-expected.txt
index fed0965..16e0c02 100755 (executable)
--- a/LayoutTests/platform/efl/fast/body-propagation/background-color/003-xhtml-expected.txt
+++ b/LayoutTests/platform/efl/fast/body-propagation/background-color/003-xhtml-expected.txt
@@ -1,8 +1,17 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
+<<<<<<< HEAD
 layer at (0,0) size 800x30
   RenderBlock {html} at (0,0) size 800x30
     RenderBody {body} at (8,8) size 784x14 [bgcolor=#FF0000]
       RenderBlock {p} at (0,0) size 784x14 [bgcolor=#00FF00]
         RenderText {#text} at (0,0) size 250x14
           text run at (0,0) width 250: "This line should be green and there should be no red."
+=======
+layer at (0,0) size 800x35
+  RenderBlock {html} at (0,0) size 800x35
+    RenderBody {body} at (8,8) size 784x19 [bgcolor=#FF0000]
+      RenderBlock {p} at (0,0) size 784x19 [bgcolor=#00FF00]
+        RenderText {#text} at (0,0) size 334x19
+          text run at (0,0) width 334: "This line should be green and there should be no red."
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d