diff options
| author | Evan Read <eread@gitlab.com> | 2021-11-19 08:00:46 +0300 |
|---|---|---|
| committer | Evan Read <eread@gitlab.com> | 2021-11-19 08:00:46 +0300 |
| commit | 7a5811b70ec10cf30776bb7a22fe54bc524727fa (patch) | |
| tree | 4468e9cc1e1d5cdedb712115dcec786fb2587bd9 | |
| parent | d838d600f0dc1e45eb714da35415a9c0aad6fd78 (diff) | |
Rename navigation entry to use for new page
| -rw-r--r-- | content/_data/navigation.yaml | 4 |
1 files 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 |