gistfile1.txt

adcsugr:taskspeed dante$ git diff tests/qooxdoo-tests.js 
diff --cc tests/qooxdoo-tests.js
index ae9c528,e4c003f..0000000
--- a/tests/qooxdoo-tests.js
+++ b/tests/qooxdoo-tests.js
@@@ -58,8 -58,7 +58,12 @@@ window.tests = 
                
                for (var i=0; i<40; i++)
                {
++<<<<<<< HEAD
 +                var table = Collection.html('<table class="madetable"></table>');
 +                document.body.appendChild(table[0]);
++=======
+                 var table = Collection.html('<table class="madetable"></table>').appendTo("body");
++>>>>>>> 4cf239aa4c711609651ae2b06b55be88338e262b
                  
                  table.append("<tr><td>first</td></tr>")
                    .find("tr")