debian-mirror-gitlab/doc/user/project/merge_requests/resolve_conflicts.md

10 lines
295 B
Markdown
Raw Normal View History

2019-09-04 21:01:54 +05:30
---
2021-12-11 22:18:48 +05:30
redirect_to: 'conflicts.md'
remove_date: '2022-01-26'
2019-09-04 21:01:54 +05:30
---
2021-12-11 22:18:48 +05:30
This document was moved to [another location](conflicts.md).
2016-09-13 17:45:13 +05:30
2021-12-11 22:18:48 +05:30
<!-- This redirect file can be deleted after <2022-01-26>. -->
<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/#move-or-rename-a-page -->