tizen beta release

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

diff --git a/LayoutTests/platform/efl/tables/mozilla/bugs/bug54450-expected.txt b/LayoutTests/platform/efl/tables/mozilla/bugs/bug54450-expected.txt
index 3c1d749..5f43c47 100755 (executable)
--- a/LayoutTests/platform/efl/tables/mozilla/bugs/bug54450-expected.txt
+++ b/LayoutTests/platform/efl/tables/mozilla/bugs/bug54450-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 784x24 [border: (1px outset #808080)]
         RenderTableSection {TBODY} at (1,1) size 782x22
           RenderTableRow {TR} at (0,2) size 782x18
@@ -12,3 +13,14 @@ layer at (0,0) size 800x600
             RenderTableCell {TD} at (392,2) size 388x18 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
               RenderText {#text} at (2,2) size 165x14
                 text run at (2,2) width 165: "xxx xxx xxx xxx xxx xxx xxx xxx"
+=======
+      RenderTable {TABLE} at (0,0) size 784x29 [border: (1px outset #808080)]
+        RenderTableSection {TBODY} at (1,1) size 782x27
+          RenderTableRow {TR} at (0,2) size 782x23
+            RenderTableCell {TD} at (2,2) size 388x23 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (2,2) size 220x19
+                text run at (2,2) width 220: "xxx xxx xxx xxx xxx xxx xxx xxx"
+            RenderTableCell {TD} at (392,2) size 388x23 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
+              RenderText {#text} at (2,2) size 220x19
+                text run at (2,2) width 220: "xxx xxx xxx xxx xxx xxx xxx xxx"
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d