gitlab-org--gitlab-foss/doc/university/training/topics/merge_conflicts.md

redirect_to	remove_date
../../../topics/git/merge_conflicts.md	2021-08-13

This document was moved to another location.