All threads resolved!
Compare changes
Conflict: This file was modified in both the source and target branches.
Ask someone with write access to resolve it.
+ 53
− 10
@@ -3,6 +3,7 @@
@@ -30,11 +31,20 @@ class MenuLinksController extends ControllerBase {
@@ -46,9 +56,11 @@ public function __construct(MenuLinkTreeInterface $menuTree) {
@@ -92,7 +104,7 @@ public function exportMenuLinks(array $form = NULL, FormStateInterface $form_sta
@@ -107,6 +119,12 @@ public function exportMenuLinks(array $form = NULL, FormStateInterface $form_sta
@@ -350,6 +368,9 @@ public static function importMenuLinksFull($menus, &$context) {
@@ -374,7 +395,7 @@ public static function importMenuLinksFull($menus, &$context) {
@@ -389,7 +410,11 @@ public static function importMenuLinksFull($menus, &$context) {
@@ -407,8 +432,13 @@ public static function importMenuLinksFull($menus, &$context) {
@@ -458,8 +488,11 @@ public static function importMenuLinksSafe($menus, &$context) {
@@ -474,7 +507,12 @@ public static function importMenuLinksSafe($menus, &$context) {
@@ -502,7 +540,7 @@ public static function deleteMenuLinks(&$context) {
@@ -517,7 +555,12 @@ public static function importMenuLinksForce($menus, &$context) {