diff options
Diffstat (limited to 'internal/gitaly/service/conflicts/resolve_conflicts.go')
-rw-r--r-- | internal/gitaly/service/conflicts/resolve_conflicts.go | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/internal/gitaly/service/conflicts/resolve_conflicts.go b/internal/gitaly/service/conflicts/resolve_conflicts.go index ee8467eed..47fb2fac6 100644 --- a/internal/gitaly/service/conflicts/resolve_conflicts.go +++ b/internal/gitaly/service/conflicts/resolve_conflicts.go @@ -6,7 +6,6 @@ import ( "encoding/json" "errors" "fmt" - "gitlab.com/gitlab-org/gitaly/v15/structerr" "io" "sort" "strings" |