9 lines
347 B
Markdown
9 lines
347 B
Markdown
---
|
|
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 -->
|