diff options
| author | Michael Muré <batolettre@gmail.com> | 2021-02-14 12:24:40 +0100 |
|---|---|---|
| committer | Michael Muré <batolettre@gmail.com> | 2021-02-14 12:24:40 +0100 |
| commit | 1ced77af1a4bdbaa212a74bf0c56b2b81cdc5bd2 (patch) | |
| tree | e19a0b4ce8c322f2378b251e38ef6c3ffa2a7646 /entity | |
| parent | d0d7be8db010e2c68c98d0a34387e4fac0c4d6ee (diff) | |
| download | git-bug-1ced77af1a4bdbaa212a74bf0c56b2b81cdc5bd2.tar.gz | |
fix merge
Diffstat (limited to 'entity')
| -rw-r--r-- | entity/dag/operation_pack.go | 2 | ||||
| -rw-r--r-- | entity/err.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/entity/dag/operation_pack.go b/entity/dag/operation_pack.go index 00cf2557..a436fd33 100644 --- a/entity/dag/operation_pack.go +++ b/entity/dag/operation_pack.go @@ -188,7 +188,7 @@ func readOperationPack(def Definition, repo repository.RepoData, resolver identi } } if version == 0 { - return nil, entity.NewErrUnknowFormat(def.FormatVersion) + return nil, entity.NewErrUnknownFormat(def.FormatVersion) } if version != def.FormatVersion { return nil, entity.NewErrInvalidFormat(version, def.FormatVersion) diff --git a/entity/err.go b/entity/err.go index 9f7f5a1a..408e27b4 100644 --- a/entity/err.go +++ b/entity/err.go @@ -43,7 +43,7 @@ func NewErrInvalidFormat(version uint, expected uint) *ErrInvalidFormat { } } -func NewErrUnknowFormat(expected uint) *ErrInvalidFormat { +func NewErrUnknownFormat(expected uint) *ErrInvalidFormat { return &ErrInvalidFormat{ version: 0, expected: expected, |