diff options
| author | John Cai <jcai@gitlab.com> | 2019-12-02 22:26:31 +0300 |
|---|---|---|
| committer | John Cai <jcai@gitlab.com> | 2019-12-02 22:26:31 +0300 |
| commit | 712a6072e8b95f989f54ecfb37cd721f96711d12 (patch) | |
| tree | 7b4a900048208f8c9be67f28d6de3a11d71c1556 /_support | |
| parent | a7069266c73b4dba35f30a04d1dfd409681a55cc (diff) | |
| parent | 6765eb9bc9ebf15076f6ea0fab9eee12b442c943 (diff) | |
Merge branch 'zj-remove-repo-conflict-header' into 'master'
Remove repository from ConflictFileHeader
Closes #2106
See merge request gitlab-org/gitaly!1636
Diffstat (limited to '_support')
0 files changed, 0 insertions, 0 deletions