Resolve merge conflicts for upstream merge

chk_rel.php

@@ -9,9 +9,7 @@
  * Gets some core libraries
  */
 require_once './libraries/common.inc.php';
-$GLOBALS['js_include'][] = 'functions.js';
 require_once './libraries/header.inc.php';
-require_once './libraries/relation.lib.php';
 
 
 /**
@@ -23,5 +21,5 @@ $cfgRelation = PMA_getRelationsParam(TRUE);
 /**
  * Displays the footer
  */
-require_once './libraries/footer.inc.php';
+require './libraries/footer.inc.php';
 ?>