Resolve merge conflicts for upstream merge

1 files changed, 1 insertions, 5 deletions

diff --git a/tbl_create.php b/tbl_create.php
index a5cdb04b65..a44ab90486 100755
--- a/tbl_create.php
+++ b/tbl_create.php
@@ -34,10 +34,7 @@
  * Get some core libraries
  */
 require_once './libraries/common.inc.php';
-require_once './libraries/Table.class.php';
-require_once './libraries/mysql_charsets.lib.php';
 
-$GLOBALS['js_include'][] = 'functions.js';
 $action = 'tbl_create.php';
 
 require_once './libraries/header.inc.php';
@@ -225,7 +222,6 @@ if (isset($_REQUEST['do_save_data'])) {
     if ($result) {
 
         // If comments were sent, enable relation stuff
-        require_once './libraries/relation.lib.php';
         require_once './libraries/transformations.lib.php';
 
         // Update comment table for mime types [MIME]
@@ -366,5 +362,5 @@ if (isset($_REQUEST['do_save_data'])) {
  */
 require './libraries/tbl_properties.inc.php';
 // Displays the footer
-require_once './libraries/footer.inc.php';
+require './libraries/footer.inc.php';
 ?>