diff options
Diffstat (limited to 'internal/service/operations/merge.go')
| -rw-r--r-- | internal/service/operations/merge.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/internal/service/operations/merge.go b/internal/service/operations/merge.go index 2e9470f5a..34c096e60 100644 --- a/internal/service/operations/merge.go +++ b/internal/service/operations/merge.go @@ -3,11 +3,12 @@ package operations import ( "fmt" - "gitlab.com/gitlab-org/gitaly-proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/internal/rubyserver" "golang.org/x/net/context" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" + + "gitlab.com/gitlab-org/gitaly-proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/internal/rubyserver" ) func (s *server) UserMergeBranch(bidi gitalypb.OperationService_UserMergeBranchServer) error { |