tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / css2.1 / t100304-c43-rpl-bbx-01-d-g-expected.txt

diff --git a/LayoutTests/platform/efl/css2.1/t100304-c43-rpl-bbx-01-d-g-expected.txt b/LayoutTests/platform/efl/css2.1/t100304-c43-rpl-bbx-01-d-g-expected.txt
index ba2ed7a..2dd0d16 100755 (executable)
--- a/LayoutTests/platform/efl/css2.1/t100304-c43-rpl-bbx-01-d-g-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t100304-c43-rpl-bbx-01-d-g-expected.txt
@@ -1,5 +1,6 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
+<<<<<<< HEAD
 layer at (0,0) size 800x442
   RenderBlock {HTML} at (0,0) size 800x442
     RenderBody {BODY} at (8,12) size 784x418
@@ -9,4 +10,15 @@ layer at (0,0) size 800x442
           text run at (296,0) width 283: "width of the window, aligned flush with the right hand side "
           text run at (579,0) width 21: "(\x{21E8})."
       RenderBlock {P} at (0,26) size 784x392 [color=#000080]
+=======
+layer at (0,0) size 800x478
+  RenderBlock {HTML} at (0,0) size 800x478
+    RenderBody {BODY} at (8,16) size 784x446
+      RenderBlock {P} at (0,0) size 784x38 [color=#000080]
+        RenderText {#text} at (0,0) size 769x38
+          text run at (0,0) width 396: "Below this paragraph there should be a big teal square half the "
+          text run at (396,0) width 373: "width of the window, aligned flush with the right hand side"
+          text run at (0,19) width 27: "(\x{21E8})."
+      RenderBlock {P} at (0,54) size 784x392 [color=#000080]
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
         RenderImage {IMG} at (392,0) size 392x392