tizen beta release

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

diff --git a/LayoutTests/platform/efl/tables/mozilla/bugs/bug2469-expected.txt b/LayoutTests/platform/efl/tables/mozilla/bugs/bug2469-expected.txt
index 69ff52a..f6ba4cb 100755 (executable)
--- a/LayoutTests/platform/efl/tables/mozilla/bugs/bug2469-expected.txt
+++ b/LayoutTests/platform/efl/tables/mozilla/bugs/bug2469-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
       RenderBlock (anonymous) at (0,0) size 784x14
         RenderInline {FONT} at (0,0) size 122x14
           RenderText {#text} at (0,0) size 122x14
@@ -15,5 +16,19 @@ layer at (0,0) size 800x600
                 RenderText {#text} at (1,1) size 185x14
                   text run at (1,1) width 185: "Text here is in times, not Helvetica"
       RenderBlock (anonymous) at (0,34) size 784x0
+=======
+      RenderBlock (anonymous) at (0,0) size 784x19
+        RenderInline {FONT} at (0,0) size 160x19
+          RenderText {#text} at (0,0) size 160x19
+            text run at (0,0) width 160: "Blah, blah in Helvetica"
+      RenderBlock (anonymous) at (0,19) size 784x25
+        RenderTable {TABLE} at (0,0) size 249x25
+          RenderTableSection {TBODY} at (0,0) size 249x25
+            RenderTableRow {TR} at (0,2) size 249x21
+              RenderTableCell {TD} at (2,2) size 245x21 [r=0 c=0 rs=1 cs=1]
+                RenderText {#text} at (1,1) size 243x19
+                  text run at (1,1) width 243: "Text here is in times, not Helvetica"
+      RenderBlock (anonymous) at (0,44) size 784x0
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
         RenderInline {FONT} at (0,0) size 0x0
         RenderText {#text} at (0,0) size 0x0