Resolve merge conflicts for upstream merge

2010-07-29 19:17:25 +05:30
parent 2bec345a46 d0fc397fe1
commit a2f78a6d38
175 changed files with 76587 additions and 70379 deletions
--- a/tbl_move_copy.php
+++ b/tbl_move_copy.php
@@ -9,7 +9,6 @@
 * Gets some core libraries
 */
 require_once './libraries/common.inc.php';
-require_once './libraries/Table.class.php';

 // Check parameters