tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / tables / mozilla / bugs / bug24503-expected.txt

diff --git a/LayoutTests/platform/efl/tables/mozilla/bugs/bug24503-expected.txt b/LayoutTests/platform/efl/tables/mozilla/bugs/bug24503-expected.txt
index dcff159..ea7c2a8 100755 (executable)
--- a/LayoutTests/platform/efl/tables/mozilla/bugs/bug24503-expected.txt
+++ b/LayoutTests/platform/efl/tables/mozilla/bugs/bug24503-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 [bgcolor=#CCCCCC]
+<<<<<<< HEAD
       RenderTable {TABLE} at (0,0) size 142x24 [border: (1px outset #808080)]
         RenderTableSection {TBODY} at (1,1) size 140x22
           RenderTableRow {TR} at (0,2) size 140x18
@@ -13,3 +14,15 @@ layer at (0,0) size 800x600
               RenderText {#text} at (2,2) size 81x14
                 text run at (2,2) width 46: "Netscape "
                 text run at (48,2) width 35: "rules!!!"
+=======
+      RenderTable {TABLE} at (0,0) size 184x29 [border: (1px outset #808080)]
+        RenderTableSection {TBODY} at (1,1) size 182x27
+          RenderTableRow {TR} at (0,2) size 182x23
+            RenderTableCell {TD} at (2,2) size 65x23 [bgcolor=#FFFFFF] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (2,2) size 61x19
+                text run at (2,2) width 61: "appName"
+            RenderTableCell {TD} at (69,2) size 111x23 [bgcolor=#FFFFFF] [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (2,2) size 107x19
+                text run at (2,2) width 62: "Netscape "
+                text run at (64,2) width 45: "rules!!!"
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d