diff options
| author | Alejandro Rodríguez <alejorro70@gmail.com> | 2018-01-17 22:39:48 +0300 |
|---|---|---|
| committer | Alejandro Rodríguez <alejorro70@gmail.com> | 2018-01-17 22:39:48 +0300 |
| commit | 9ffdca91c5b3a037d5e19fe1f9728d159ff9e53f (patch) | |
| tree | 88baebc9ae4ae3b065511ab84debec208726b3ce | |
| parent | b428a650bfaefdd1e65631dd54d9f455fc60d67c (diff) | |
Fix error message labels for ConflictsService.ResolveConflicts
| -rw-r--r-- | internal/service/conflicts/resolve_conflicts.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/internal/service/conflicts/resolve_conflicts.go b/internal/service/conflicts/resolve_conflicts.go index 7f3cf28d4..9a121aa37 100644 --- a/internal/service/conflicts/resolve_conflicts.go +++ b/internal/service/conflicts/resolve_conflicts.go @@ -17,11 +17,11 @@ func (s *server) ResolveConflicts(stream pb.ConflictsService_ResolveConflictsSer header := firstRequest.GetHeader() if header == nil { - return grpc.Errorf(codes.InvalidArgument, "ListConflictFiles: empty ResolveConflictsRequestHeader") + return grpc.Errorf(codes.InvalidArgument, "ResolveConflicts: empty ResolveConflictsRequestHeader") } if err = validateResolveConflictsHeader(header); err != nil { - return grpc.Errorf(codes.InvalidArgument, "ListConflictFiles: %v", err) + return grpc.Errorf(codes.InvalidArgument, "ResolveConflicts: %v", err) } ctx := stream.Context() |