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 /querywindow.php | |
| parent | 2bec345a46d11293b93c2b06bf8009c913cde8fb (diff) | |
| parent | d0fc397fe1c474150883e85a791a012a7ae03380 (diff) | |
Resolve merge conflicts for upstream merge
Diffstat (limited to 'querywindow.php')
| -rwxr-xr-x | querywindow.php | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/querywindow.php b/querywindow.php index 7b2b08d1bd..86af6c01b6 100755 --- a/querywindow.php +++ b/querywindow.php @@ -50,9 +50,8 @@ require_once './libraries/ob.lib.php'; PMA_outBufferPre(); /** - * load relations + * load relation params */ -require_once './libraries/relation.lib.php'; $cfgRelation = PMA_getRelationsParam(); /** @@ -155,7 +154,6 @@ $sql_query = ''; * prepare JavaScript functionality */ $js_include[] = 'common.js'; -$js_include[] = 'functions.js'; $js_include[] = 'querywindow.js'; if (PMA_isValid($_REQUEST['auto_commit'], 'identical', 'true')) { |