tizen beta release

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

diff --git a/LayoutTests/platform/efl/tables/mozilla/bugs/bug149275-2-expected.txt b/LayoutTests/platform/efl/tables/mozilla/bugs/bug149275-2-expected.txt
index cc51c1e..a62794c 100755 (executable)
--- a/LayoutTests/platform/efl/tables/mozilla/bugs/bug149275-2-expected.txt
+++ b/LayoutTests/platform/efl/tables/mozilla/bugs/bug149275-2-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 37x100 [border: (1px outset #808080)]
         RenderTableSection {TBODY} at (1,1) size 35x98
           RenderTableRow {TR} at (0,2) size 35x94
@@ -11,3 +12,13 @@ layer at (13,22) size 27x72 clip at (16,25) size 21x66
   RenderBlock {DIV} at (2,2) size 27x72 [border: (3px solid #000000)]
     RenderText {#text} at (3,3) size 21x14
       text run at (3,3) width 21: "Text"
+=======
+      RenderTable {TABLE} at (0,0) size 45x100 [border: (1px outset #808080)]
+        RenderTableSection {TBODY} at (1,1) size 43x98
+          RenderTableRow {TR} at (0,2) size 43x94
+            RenderTableCell {TD} at (2,11) size 39x76 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
+layer at (13,22) size 35x72 clip at (16,25) size 29x66
+  RenderBlock {DIV} at (2,2) size 35x72 [border: (3px solid #000000)]
+    RenderText {#text} at (3,3) size 29x19
+      text run at (3,3) width 29: "Text"
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d