Commit c30376a5 authored by webchick's avatar webchick

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

parent d5731401
......@@ -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.
*/
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment