X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=LayoutTests%2Fplatform%2Fefl%2Ffast%2Fblock%2Fmargin-collapse%2Fblock-inside-inline%2F001-expected.txt;h=3d7a9c59f10355009effe20c4b9baea2feda7d81;hb=b96e33af77ac7d81a666d5aa202235b793aeeb21;hp=714c5133f8dddd6559dec49a1329edc79acd7a96;hpb=2632619e54bc9f41ccea7c574710fe213e49212d;p=framework%2Fweb%2Fwebkit-efl.git

diff --git a/LayoutTests/platform/efl/fast/block/margin-collapse/block-inside-inline/001-expected.txt b/LayoutTests/platform/efl/fast/block/margin-collapse/block-inside-inline/001-expected.txt
index 714c513..3d7a9c5 100755
--- a/LayoutTests/platform/efl/fast/block/margin-collapse/block-inside-inline/001-expected.txt
+++ b/LayoutTests/platform/efl/fast/block/margin-collapse/block-inside-inline/001-expected.txt
@@ -1,5 +1,6 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
+<<<<<<< HEAD
 layer at (0,0) size 800x456
   RenderBlock {HTML} at (0,0) size 800x456
     RenderBody {BODY} at (8,12) size 784x432
@@ -7,6 +8,15 @@ layer at (0,0) size 800x456
         RenderText {#text} at (0,0) size 377x14
           text run at (0,0) width 377: "The following two columns should be pixel perfect identical with no red visible."
       RenderTable {TABLE} at (0,26) size 78x380 [border: (3px solid #000000)]
+=======
+layer at (0,0) size 800x482
+  RenderBlock {HTML} at (0,0) size 800x482
+    RenderBody {BODY} at (8,16) size 784x450
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 504x19
+          text run at (0,0) width 504: "The following two columns should be pixel perfect identical with no red visible."
+      RenderTable {TABLE} at (0,35) size 78x380 [border: (3px solid #000000)]
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
         RenderTableSection {TBODY} at (3,3) size 72x374
           RenderTableRow {TR} at (0,0) size 72x374
             RenderTableCell {TD} at (0,0) size 36x374 [bgcolor=#FFA500] [r=0 c=0 rs=1 cs=1]
@@ -101,6 +111,7 @@ layer at (0,0) size 800x456
                 RenderBlock {DIV} at (0,216) size 36x58 [bgcolor=#00FFFF]
                   RenderText {#text} at (0,1) size 33x56
                     text run at (0,1) width 33: "C"
+<<<<<<< HEAD
       RenderBlock {P} at (0,418) size 784x14
         RenderText {#text} at (0,0) size 196x14
           text run at (0,0) width 196: "This test is meaningless if you don't pass "
@@ -109,3 +120,13 @@ layer at (0,0) size 800x456
             text run at (196,0) width 37: "test 006"
         RenderText {#text} at (233,0) size 3x14
           text run at (233,0) width 3: "."
+=======
+      RenderBlock {P} at (0,431) size 784x19
+        RenderText {#text} at (0,0) size 259x19
+          text run at (0,0) width 259: "This test is meaningless if you don't pass "
+        RenderInline {A} at (0,0) size 49x19 [color=#0000EE]
+          RenderText {#text} at (259,0) size 49x19
+            text run at (259,0) width 49: "test 006"
+        RenderText {#text} at (308,0) size 4x19
+          text run at (308,0) width 4: "."
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d