Skip to content

Commit

Permalink
Fix merge fail
Browse files Browse the repository at this point in the history
  • Loading branch information
dwburke committed Feb 28, 2020
1 parent c7e1113 commit b9304d4
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions instance/private_parents.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ func (ci *Client) DerivePrivateParentUniqId(name string) (string, error) {
privateParentUniqId = name
} else {
privateParentDetailsErr = fmt.Errorf(
"failed fetching parent details treating given --private-parent arg as a uniq_id [%s]: %s",
"failed fetching parent details treating given --private-parent arg as a uniq-id [%s]: %s",
name, err)
}
}
Expand Down Expand Up @@ -68,7 +68,7 @@ func (ci *Client) DerivePrivateParentUniqId(name string) (string, error) {
&privateParentDetails)
if err != nil {
privateParentDetailsErr = fmt.Errorf(
"failed fetching private parent details for discovered uniq_id [%s] error: %s %w",
"failed fetching private parent details for discovered uniq-id [%s] error: %s %w",
privateParentDetails.UniqId, err, privateParentDetailsErr)
return "", privateParentDetailsErr
}
Expand Down

0 comments on commit b9304d4

Please sign in to comment.