tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / fast / block / margin-collapse / 012-expected.txt

diff --git a/LayoutTests/platform/efl/fast/block/margin-collapse/012-expected.txt b/LayoutTests/platform/efl/fast/block/margin-collapse/012-expected.txt
index 6b0f1cc..f261801 100755 (executable)
--- a/LayoutTests/platform/efl/fast/block/margin-collapse/012-expected.txt
+++ b/LayoutTests/platform/efl/fast/block/margin-collapse/012-expected.txt
@@ -1,5 +1,6 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
+<<<<<<< HEAD
 layer at (0,0) size 800x332
   RenderBlock {HTML} at (0,0) size 800x332
     RenderBody {BODY} at (8,12) size 784x308
@@ -7,6 +8,15 @@ layer at (0,0) size 800x332
         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 106x256 [bgcolor=#FF0000] [border: (3px solid #000000)]
+=======
+layer at (0,0) size 800x358
+  RenderBlock {HTML} at (0,0) size 800x358
+    RenderBody {BODY} at (8,16) size 784x326
+      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 106x256 [bgcolor=#FF0000] [border: (3px solid #000000)]
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
         RenderTableSection {TBODY} at (3,3) size 100x250
           RenderTableRow {TR} at (0,0) size 100x250
             RenderTableCell {TD} at (0,0) size 50x250 [bgcolor=#FFA500] [r=0 c=0 rs=1 cs=1]
@@ -18,6 +28,7 @@ layer at (0,0) size 800x332
               RenderBlock {DIV} at (0,100) size 50x50 [border: (50px solid #FFA500) none]
               RenderBlock {DIV} at (0,150) size 50x50 [border: (50px solid #00FF00) none]
               RenderBlock {DIV} at (0,200) size 50x50 [border: (50px solid #FFA500) none]
+<<<<<<< HEAD
       RenderBlock {P} at (0,294) 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 "
@@ -26,3 +37,13 @@ layer at (0,0) size 800x332
             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,307) 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