diff options
author | ninadsp <ninadsp16289@gmail.com> | 2010-07-29 17:47:25 +0400 |
---|---|---|
committer | ninadsp <ninadsp16289@gmail.com> | 2010-07-29 17:47:25 +0400 |
commit | a2f78a6d38f74f0cc62f2a5837e682901331c21e (patch) | |
tree | ceab0c3ae4efe05fe345f270bdf4d236d24ef63d /server_databases.php | |
parent | 2bec345a46d11293b93c2b06bf8009c913cde8fb (diff) | |
parent | d0fc397fe1c474150883e85a791a012a7ae03380 (diff) |
Resolve merge conflicts for upstream merge
Diffstat (limited to 'server_databases.php')
-rwxr-xr-x | server_databases.php | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/server_databases.php b/server_databases.php index 0c7d598e55..7aeee672cd 100755 --- a/server_databases.php +++ b/server_databases.php @@ -10,8 +10,6 @@ */ require_once './libraries/common.inc.php'; - -$GLOBALS['js_include'][] = 'functions.js'; require './libraries/server_common.inc.php'; require './libraries/replication.inc.php'; @@ -384,6 +382,6 @@ if ($cfg['ShowCreateDb']) { /** * Sends the footer */ -require_once './libraries/footer.inc.php'; +require './libraries/footer.inc.php'; ?> |