diff options
Diffstat (limited to 'internal/git2go/resolve_conflicts.go')
| -rw-r--r-- | internal/git2go/resolve_conflicts.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/internal/git2go/resolve_conflicts.go b/internal/git2go/resolve_conflicts.go index ae2545531..c679d2454 100644 --- a/internal/git2go/resolve_conflicts.go +++ b/internal/git2go/resolve_conflicts.go @@ -6,8 +6,8 @@ import ( "encoding/gob" "fmt" - "gitlab.com/gitlab-org/gitaly/v14/internal/git/conflict" - "gitlab.com/gitlab-org/gitaly/v14/internal/git/repository" + "gitlab.com/gitlab-org/gitaly/internal/git/conflict" + "gitlab.com/gitlab-org/gitaly/internal/git/repository" ) // ResolveCommand contains arguments to perform a merge commit and resolve any |