Resolve merge conflicts for upstream merge

server_export.php

@@ -10,8 +10,6 @@
  */
 require_once './libraries/common.inc.php';
 
-$GLOBALS['js_include'][] = 'functions.js';
-
 /**
  * Displays the links
  */
@@ -49,5 +47,5 @@ require_once './libraries/display_export.lib.php';
 /**
  * Displays the footer
  */
-require_once './libraries/footer.inc.php';
+require './libraries/footer.inc.php';
 ?>