- Patch #1037352 by David_Rothstein: removed conflict.

modules/system/system.api.php

@@ -1908,7 +1908,6 @@ function hook_system_info_alter(&$info, $file, $type) {
  *     have inherent security risks across a variety of potential use cases
  *     (for example, the "administer filters" and "bypass node access"
  *     permissions provided by Drupal core). When set to TRUE, a standard
-<<<<<<< HEAD
  *     warning message defined in user_admin_permissions() and output via
  *     theme_user_permission_description() will be associated with the
  *     permission and displayed with it on the permission administration page.
@@ -1922,14 +1921,6 @@ function hook_system_info_alter(&$info, $file, $type) {
  *     is specific to the permission you are defining.
  *
  * @see theme_user_permission_description()
-=======
- *     warning message defined in user_admin_permissions() will be associated
- *     with the permission and displayed with it on the permission
- *     administration page. Defaults to FALSE.
- *   - warning: (optional) A translated warning message to display on the
- *     permission administration page. This warning overrides the automatic
- *     warning generated by 'restrict access' being set to TRUE.
->>>>>>> f1ba363a8c3b5185e4e663bd2c3b7eb7b0fb9983
  */
 function hook_permission() {
   return array(