From e8e87ae67556a32a43e3dd7601cd52c7d2e36e07 Mon Sep 17 00:00:00 2001
From: ninadsp <ninadsp16289@gmail.com>
Date: Thu, 29 Jul 2010 22:53:07 +0530
Subject: [PATCH] Resolved conflicts left over from previous merge

---
 server_privileges.php | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/server_privileges.php b/server_privileges.php
index 49f812f37..c75de7afd 100755
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -974,18 +974,14 @@ if (isset($_REQUEST['adduser_submit']) || isset($_REQUEST['change_copy'])) {
                         $message = PMA_Message::rawError(PMA_DBI_getError());
                         break;
                     }
-<<<<<<< HEAD
+
 
                     if($GLOBALS['is_ajax_request'] != true) {
+                        // this is needed in case tracking is on:
+                        $GLOBALS['db'] = $username;
                         $GLOBALS['reload'] = TRUE;
                         PMA_reloadNavigation();
                     }
-=======
-                    // this is needed in case tracking is on:
-                    $GLOBALS['db'] = $username;
-                    $GLOBALS['reload'] = TRUE;
-                    PMA_reloadNavigation();
->>>>>>> origin/master
 
                     $q = 'GRANT ALL PRIVILEGES ON '
                         . PMA_backquote(PMA_sqlAddslashes($username)) . '.* TO \''