tizen beta release

[profile/ivi/webkit-efl.git] / LayoutTests / platform / efl / tables / mozilla_expected_failures / bugs / bug33784-expected.txt

diff --git a/LayoutTests/platform/efl/tables/mozilla_expected_failures/bugs/bug33784-expected.txt b/LayoutTests/platform/efl/tables/mozilla_expected_failures/bugs/bug33784-expected.txt
index 984ae35..6730ef7 100755 (executable)
--- a/LayoutTests/platform/efl/tables/mozilla_expected_failures/bugs/bug33784-expected.txt
+++ b/LayoutTests/platform/efl/tables/mozilla_expected_failures/bugs/bug33784-expected.txt
@@ -3,6 +3,7 @@ layer at (0,0) size 800x600
 layer at (0,0) size 800x600
   RenderBlock {HTML} at (0,0) size 800x600
     RenderBody {BODY} at (8,8) size 784x584
+<<<<<<< HEAD
       RenderTable {TABLE} at (0,0) size 600x14
         RenderTableSection {TBODY} at (0,0) size 600x14
           RenderTableRow {TR} at (0,0) size 600x14
@@ -11,3 +12,13 @@ layer at (0,0) size 800x600
                 RenderBlock {P} at (0,0) size 600x14
                   RenderText {#text} at (0,0) size 37x14
                     text run at (0,0) width 37: "fooobar"
+=======
+      RenderTable {TABLE} at (0,0) size 600x19
+        RenderTableSection {TBODY} at (0,0) size 600x19
+          RenderTableRow {TR} at (0,0) size 600x19
+            RenderTableCell {TD} at (0,0) size 600x19 [bgcolor=#000000] [r=0 c=0 rs=1 cs=1]
+              RenderBlock {DIV} at (0,0) size 600x19 [color=#FFFFFF]
+                RenderBlock {P} at (0,0) size 600x19
+                  RenderText {#text} at (0,0) size 49x19
+                    text run at (0,0) width 49: "fooobar"
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d