diff options
| author | Evan Read <eread@gitlab.com> | 2021-12-17 14:56:31 +0300 |
|---|---|---|
| committer | Marcin Sedlak-Jakubowski <msedlakjakubowski@gitlab.com> | 2021-12-17 14:56:31 +0300 |
| commit | eef9248c94ae35ce96f1f42eff88f8e363ce21b0 (patch) | |
| tree | 75932aa126946df97a71643ba6408a33b3933776 | |
| parent | 85223b07046a216adc1a693f95e6199f01c09afe (diff) | |
Fix menu item for renamed topic
| -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 c910c505..ab6192c6 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 |