diff options
Diffstat (limited to 'cmd/gitaly-git2go/resolve_conflicts.go')
| -rw-r--r-- | cmd/gitaly-git2go/resolve_conflicts.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmd/gitaly-git2go/resolve_conflicts.go b/cmd/gitaly-git2go/resolve_conflicts.go index 3bb991f06..8ac19f0d5 100644 --- a/cmd/gitaly-git2go/resolve_conflicts.go +++ b/cmd/gitaly-git2go/resolve_conflicts.go @@ -14,8 +14,8 @@ import ( "time" git "github.com/libgit2/git2go/v31" - "gitlab.com/gitlab-org/gitaly/internal/git/conflict" - "gitlab.com/gitlab-org/gitaly/internal/git2go" + "gitlab.com/gitlab-org/gitaly/v14/internal/git/conflict" + "gitlab.com/gitlab-org/gitaly/v14/internal/git2go" ) type resolveSubcommand struct { |