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 /import.php | |
| parent | 2bec345a46d11293b93c2b06bf8009c913cde8fb (diff) | |
| parent | d0fc397fe1c474150883e85a791a012a7ae03380 (diff) | |
Resolve merge conflicts for upstream merge
Diffstat (limited to 'import.php')
| -rwxr-xr-x | import.php | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/import.php b/import.php index b123064191..dbc4d56ad3 100755 --- a/import.php +++ b/import.php @@ -12,7 +12,6 @@ */ require_once './libraries/common.inc.php'; //require_once './libraries/display_import_functions.lib.php'; -$GLOBALS['js_include'][] = 'functions.js'; // reset import messages for ajax request $_SESSION['Import_message']['message'] = null; |