Revert "Merge branch 'pks-go-resolve-conflicts-default-enable' into 'master'" (!3343) · Merge requests · GitLab.org / gitaly · GitLab

Patrick Steinhardt requested to merge pks-revert-go-resolve-conflicts-default-enabled into master Apr 07, 2021

This reverts commit 8e62ebd1, reversing changes made to 8df8c774 as it is causing failures in staging (see gitlab!58736 (closed))