From f05beef761d1db3d2aec051bd65bce66dbd171ef Mon Sep 17 00:00:00 2001
From: Hugues Peccatte <hugues.peccatte@gmail.com>
Date: Sat, 29 Aug 2015 16:21:15 +0200
Subject: [PATCH] Fix merge.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
---
 libraries/operations.lib.php | 23 +++--------------------
 1 file changed, 3 insertions(+), 20 deletions(-)

diff --git a/libraries/operations.lib.php b/libraries/operations.lib.php
index 65ed5974b2..3e04c59a3b 100644
--- a/libraries/operations.lib.php
+++ b/libraries/operations.lib.php
@@ -252,11 +252,7 @@ function PMA_getHtmlForCopyDatabase($db)
                 . '" disabled/>';
         }
         $html_output .= '<label for="checkbox_privileges">'
-<<<<<<< HEAD
-            . __('Adjust privileges') . PMA_Util::showDocu('faq', 'faq6-39')
-=======
-            . __('Adjust Privileges') . PMA\libraries\Util::showDocu('faq', 'faq6-39')
->>>>>>> Set namespace on Advisor, Config, Console and Util classes.
+            . __('Adjust privileges') . PMA\libraries\Util::showDocu('faq', 'faq6-39')
             . '</label><br />';
     }
 
@@ -886,11 +882,7 @@ function PMA_getHtmlForMoveTable()
                 . '" disabled/>';
         }
         $html_output .= '<label for="checkbox_privileges_tables_move">'
-<<<<<<< HEAD
-            . __('Adjust privileges') . PMA_Util::showDocu('faq', 'faq6-39')
-=======
-            . __('Adjust Privileges') . PMA\libraries\Util::showDocu('faq', 'faq6-39')
->>>>>>> Set namespace on Advisor, Config, Console and Util classes.
+            . __('Adjust privileges') . PMA\libraries\Util::showDocu('faq', 'faq6-39')
             . '</label><br />';
     }
 
@@ -984,13 +976,8 @@ function PMA_getHtmlForRenameTable()
                 . '" disabled/>';
         }
         $html_output .= '<label for="checkbox_privileges_table_options">'
-<<<<<<< HEAD
             . __('Adjust privileges') . '&nbsp;'
-            . PMA_Util::showDocu('faq', 'faq6-39') . '</label>';
-=======
-            . __('Adjust Privileges') . '&nbsp;'
             . PMA\libraries\Util::showDocu('faq', 'faq6-39') . '</label>';
->>>>>>> Set namespace on Advisor, Config, Console and Util classes.
     }
 
     $html_output .= '</td></tr>';
@@ -1343,11 +1330,7 @@ function PMA_getHtmlForCopytable()
                 . '" disabled/>';
         }
         $html_output .= '<label for="checkbox_adjust_privileges">'
-<<<<<<< HEAD
-            . __('Adjust privileges') . PMA_Util::showDocu('faq', 'faq6-39')
-=======
-            . __('Adjust Privileges') . PMA\libraries\Util::showDocu('faq', 'faq6-39')
->>>>>>> Set namespace on Advisor, Config, Console and Util classes.
+            . __('Adjust privileges') . PMA\libraries\Util::showDocu('faq', 'faq6-39')
             . '</label><br />';
     }