X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=LayoutTests%2Fplatform%2Fefl%2Ffast%2Fblock%2Fpositioning%2Fauto%2F001-expected.txt;h=983a2b295074062c8ecfba0cf534dce3705f4dec;hb=b96e33af77ac7d81a666d5aa202235b793aeeb21;hp=6a2994395ac0257871912f198e13fe56b42a9793;hpb=2632619e54bc9f41ccea7c574710fe213e49212d;p=framework%2Fweb%2Fwebkit-efl.git

diff --git a/LayoutTests/platform/efl/fast/block/positioning/auto/001-expected.txt b/LayoutTests/platform/efl/fast/block/positioning/auto/001-expected.txt
index 6a29943..983a2b2 100755
--- a/LayoutTests/platform/efl/fast/block/positioning/auto/001-expected.txt
+++ b/LayoutTests/platform/efl/fast/block/positioning/auto/001-expected.txt
@@ -2,6 +2,7 @@ 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 784x28
         RenderText {#text} at (0,0) size 769x28
@@ -17,4 +18,22 @@ layer at (78,168) size 100x100
 layer at (78,68) size 100x100
   RenderBlock (positioned) {DIV} at (70,20) size 100x100 [bgcolor=#808000]
 layer at (78,268) size 100x100
+=======
+    RenderBody {BODY} at (8,8) size 784x576
+      RenderBlock {P} at (0,0) size 784x57
+        RenderText {#text} at (0,0) size 777x57
+          text run at (0,0) width 561: "In this test, you should see three blocks that are centered horizontally within a black box. "
+          text run at (561,0) width 211: "They should be stacked vertically"
+          text run at (0,19) width 303: "with the green box in between two olive boxes. "
+          text run at (303,19) width 474: "The olive boxes and the green box should be 100x100, and there should be"
+          text run at (0,38) width 325: "50 pixels of padding on either side of the box stack."
+layer at (8,81) size 240x340
+  RenderBlock (positioned) {DIV} at (8,81) size 240x340 [border: (20px solid #000000)]
+    RenderBlock {DIV} at (70,70) size 100x0
+layer at (78,201) size 100x100
+  RenderBlock (positioned) {SPAN} at (70,120) size 100x100 [bgcolor=#008000]
+layer at (78,101) size 100x100
+  RenderBlock (positioned) {DIV} at (70,20) size 100x100 [bgcolor=#808000]
+layer at (78,301) size 100x100
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
   RenderBlock (positioned) {DIV} at (70,220) size 100x100 [bgcolor=#808000]