tizen beta release

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

diff --git a/LayoutTests/platform/efl/tables/mozilla/bugs/bug29314-expected.txt b/LayoutTests/platform/efl/tables/mozilla/bugs/bug29314-expected.txt
index e31d1be..4e8a8ec 100755 (executable)
--- a/LayoutTests/platform/efl/tables/mozilla/bugs/bug29314-expected.txt
+++ b/LayoutTests/platform/efl/tables/mozilla/bugs/bug29314-expected.txt
@@ -1,8 +1,16 @@
+<<<<<<< HEAD
 layer at (0,0) size 1009x600
   RenderView 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
+=======
+layer at (0,0) size 1009x585
+  RenderView at (0,0) size 800x585
+layer at (0,0) size 800x585
+  RenderBlock {HTML} at (0,0) size 800x585
+    RenderBody {BODY} at (8,8) size 784x569
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
       RenderTable {TABLE} at (0,0) size 1001x226
         RenderTableSection {TBODY} at (0,0) size 1001x226
           RenderTableRow {TR} at (0,2) size 1001x222