Removed unresolved section
This commit is contained in:
6
sql.php
6
sql.php
@@ -10,6 +10,7 @@
|
||||
* Gets some core libraries
|
||||
*/
|
||||
require_once './libraries/common.inc.php';
|
||||
require_once './libraries/Table.class.php';
|
||||
require_once './libraries/check_user_privileges.lib.php';
|
||||
require_once './libraries/bookmark.lib.php';
|
||||
|
||||
@@ -667,11 +668,10 @@ else {
|
||||
if (isset($printview) && $printview == '1') {
|
||||
require_once './libraries/header_printview.inc.php';
|
||||
} else {
|
||||
<<<<<<< HEAD
|
||||
|
||||
$GLOBALS['js_include'][] = 'functions.js';
|
||||
$GLOBALS['js_include'][] = 'sql.js';
|
||||
=======
|
||||
>>>>>>> origin/master
|
||||
|
||||
unset($message);
|
||||
|
||||
if( $GLOBALS['is_ajax_request'] != true) {
|
||||
|
Reference in New Issue
Block a user