diff options
Diffstat (limited to 'cmd/gitaly-git2go/conflicts.go')
| -rw-r--r-- | cmd/gitaly-git2go/conflicts.go | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/cmd/gitaly-git2go/conflicts.go b/cmd/gitaly-git2go/conflicts.go index ac406b1f3..63c1b1869 100644 --- a/cmd/gitaly-git2go/conflicts.go +++ b/cmd/gitaly-git2go/conflicts.go @@ -8,8 +8,6 @@ import ( "errors" "flag" "fmt" - "gitlab.com/gitlab-org/gitaly/v15/structerr" - git "github.com/libgit2/git2go/v34" "gitlab.com/gitlab-org/gitaly/v15/cmd/gitaly-git2go/git2goutil" "gitlab.com/gitlab-org/gitaly/v15/internal/git2go" |