From 7a5811b70ec10cf30776bb7a22fe54bc524727fa Mon Sep 17 00:00:00 2001 From: Evan Read Date: Fri, 19 Nov 2021 15:00:46 +1000 Subject: Rename navigation entry to use for new page --- content/_data/navigation.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/_data/navigation.yaml b/content/_data/navigation.yaml index 6d480b6d..53ad807b 100644 --- a/content/_data/navigation.yaml +++ b/content/_data/navigation.yaml @@ -1298,8 +1298,8 @@ sections: doc_url: 'ee/user/project/merge_requests/fast_forward_merge.html' - doc_title: Merge when pipeline succeeds doc_url: 'ee/user/project/merge_requests/merge_when_pipeline_succeeds.html' - - doc_title: Resolve conflicts - doc_url: 'ee/user/project/merge_requests/resolve_conflicts.html' + - doc_title: Merge conflicts + doc_url: 'ee/user/project/merge_requests/conflicts.html' - doc_title: Reverting changes doc_url: 'ee/user/project/merge_requests/revert_changes.html' - doc_title: Reviewing and managing merge requests -- cgit v1.2.3