tizen beta release

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

diff --git a/LayoutTests/platform/efl/fast/body-propagation/background-color/006-expected.txt b/LayoutTests/platform/efl/fast/body-propagation/background-color/006-expected.txt
index 7aa88ec..dc50ea9 100755 (executable)
--- a/LayoutTests/platform/efl/fast/body-propagation/background-color/006-expected.txt
+++ b/LayoutTests/platform/efl/fast/body-propagation/background-color/006-expected.txt
@@ -1,5 +1,6 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
+<<<<<<< HEAD
 layer at (0,0) size 800x38
   RenderBlock {HTML} at (0,0) size 800x38
     RenderBody {BODY} at (8,12) size 784x14
@@ -7,3 +8,12 @@ layer at (0,0) size 800x38
         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."
     RenderBody {BODY} at (8,38) size 784x0 [bgcolor=#FF0000]
+=======
+layer at (0,0) size 800x51
+  RenderBlock {HTML} at (0,0) size 800x51
+    RenderBody {BODY} at (8,16) size 784x19
+      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."
+    RenderBody {BODY} at (8,51) size 784x0 [bgcolor=#FF0000]
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d