Skip to content

Commit

Permalink
state: fix bad conflict resolution
Browse files Browse the repository at this point in the history
  • Loading branch information
Roger Peppe committed Aug 7, 2013
1 parent eee4365 commit 3efed18
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions state/state.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -472,6 +472,7 @@ func (st *State) FindEntity(tag string) (Entity, error) {
kind, id, err := names.ParseTag(tag, "")
// TODO(fwereade): when lp:1199352 (relation lacks Tag) is fixed, add
// support for relation entities here.
switch kind {
case names.MachineTagKind:
return st.Machine(id)
case names.UnitTagKind:
Expand Down

0 comments on commit 3efed18

Please sign in to comment.