#337820 follow-up: Reverting conflict cruft that somehow got introduced the last commit.

modules/system/system.install

@@ -3090,18 +3090,6 @@ function system_update_7012() {
 }
 
 /**
-<<<<<<< system.install
- * Change the user logout path.
- */
-function system_update_7014() {
-  $ret = array();
-  $ret[] = update_sql("UPDATE {menu_links} SET link_path = 'user/login' WHERE link_path = 'login'");
-  $ret[] = update_sql("UPDATE {menu_links} SET router_path = 'user/login' WHERE router_path = 'login'");
-  return $ret;
-}
-
-/**
-=======
  * Convert default time zone offset to default time zone name.
  */
 function system_update_7013() {
@@ -3143,7 +3131,6 @@ function system_update_7013() {
 }
 
 /**
->>>>>>> 1.282
  * @} End of "defgroup updates-6.x-to-7.x"
  * The next series of updates should start at 8000.
  */