View difference between Paste ID: QzPbx7wv and

-
+  $items['admin/people/cancel'] = array(
     'title' => 'Cancel user',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('user_multiple_cancel_confirm'),
     'access arguments' => array('administer users'),
     'file' => 'user.admin.inc',
     'type' => MENU_CALLBACK,
   );
 
   // Administration pages.
   $items['admin/config/people'] = array(
 <<<<<<< HEAD
     'title' => 'People',
     'description' => 'Configure user accounts.',
     'position' => 'left',
     'weight' => -20,
     'route_name' => 'user_admin_index',
 =======
    'title' => 'People',
    'description' => 'Configure user accounts.',
    'position' => 'left',
    'weight' => -20,
    'page callback' => 'system_admin_menu_block_page',
    'access arguments' => array('administer account settings'),
    'file' => 'system.admin.inc',
    'file path' => drupal_get_path('module', 'system'),
 >>>>>>> "Administer Users" permission should be separate from "User Settings"
   );
 
   $items['admin/config/people/accounts'] = array(
     'title' => 'Account settings',
     'description' => 'Configure default behavior of users, including registration requirements, e-mails, and fields.',
     'weight' => -10,
     'route_name' => 'user_account_settings',
   );
   $items['admin/config/people/accounts/settings'] = array(
     'title' => 'Settings',
     'type' => MENU_DEFAULT_LOCAL_TASK,
   );