diff options
Diffstat (limited to 'internal/server')
| -rw-r--r-- | internal/server/repository/repository.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/internal/server/repository/repository.go b/internal/server/repository/repository.go index b6a1edb..ffe4d37 100644 --- a/internal/server/repository/repository.go +++ b/internal/server/repository/repository.go @@ -187,9 +187,9 @@ func (r Repository) Merge(otherEnt types.Entry) error { func (r Repository) MergeRemotely(ctx context.Context) error { var errs []error - partners := r.conf.Partners() - if len(partners) == 0 { - return fmt.Errorf("no parter for remote merge operation configured") + partners, err := r.conf.Partners() + if err != nil { + return err } for _, partner := range partners { |