tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / css2.1 / t1602-c43-center-00-d-ag-expected.txt

diff --git a/LayoutTests/platform/efl/css2.1/t1602-c43-center-00-d-ag-expected.txt b/LayoutTests/platform/efl/css2.1/t1602-c43-center-00-d-ag-expected.txt
index 7a35253..0aa362d 100755 (executable)
--- a/LayoutTests/platform/efl/css2.1/t1602-c43-center-00-d-ag-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t1602-c43-center-00-d-ag-expected.txt
@@ -1,5 +1,6 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
+<<<<<<< HEAD
 layer at (0,0) size 800x91
   RenderBlock {HTML} at (0,0) size 800x91
     RenderBody {BODY} at (8,12) size 784x71
@@ -11,5 +12,18 @@ layer at (0,0) size 800x91
       RenderBlock {DIV} at (0,41) size 784x15
         RenderImage {IMG} at (385,0) size 15x15
       RenderBlock {DIV} at (0,56) size 784x15 [color=#0000FF]
+=======
+layer at (0,0) size 800x104
+  RenderBlock {HTML} at (0,0) size 800x104
+    RenderBody {BODY} at (8,16) size 784x80
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 413x19
+          text run at (0,0) width 413: "There should be a single small column of blue below with no red:"
+      RenderBlock {DIV} at (0,35) size 784x15
+        RenderImage {IMG} at (384,0) size 15x15
+      RenderBlock {DIV} at (0,50) size 784x15
+        RenderImage {IMG} at (385,0) size 15x15
+      RenderBlock {DIV} at (0,65) size 784x15 [color=#0000FF]
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
         RenderText {#text} at (384,0) size 16x15
           text run at (384,0) width 16: "X"