diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-19 12:08:42 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-19 12:08:42 +0300 |
commit | b76ae638462ab0f673e5915986070518dd3f9ad3 (patch) | |
tree | bdab0533383b52873be0ec0eb4d3c66598ff8b91 /doc/university/training/topics/merge_conflicts.md | |
parent | 434373eabe7b4be9593d18a585fb763f1e5f1a6f (diff) |
Add latest changes from gitlab-org/gitlab@14-2-stable-eev14.2.0-rc42
Diffstat (limited to 'doc/university/training/topics/merge_conflicts.md')
-rw-r--r-- | doc/university/training/topics/merge_conflicts.md | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/doc/university/training/topics/merge_conflicts.md b/doc/university/training/topics/merge_conflicts.md deleted file mode 100644 index f4f12a17dbd..00000000000 --- a/doc/university/training/topics/merge_conflicts.md +++ /dev/null @@ -1,9 +0,0 @@ ---- -redirect_to: '../../../topics/git/merge_conflicts.md' -remove_date: '2021-08-13' ---- - -This document was moved to [another location](../../../topics/git/merge_conflicts.md). - -<!-- This redirect file can be deleted after <2021-08-13>. --> -<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/#move-or-rename-a-page --> |