fix rebase conflict

This commit is contained in:
leonardo.yvens 2017-11-01 09:47:18 -02:00
parent 27efe126e0
commit 5e74353981

View file

@ -1871,7 +1871,7 @@ impl Item_ {
ItemEnum(_, ref generics) |
ItemStruct(_, ref generics) |
ItemUnion(_, ref generics) |
ItemTrait(_, ref generics, _, _) |
ItemTrait(_, _, ref generics, _, _) |
ItemImpl(_, _, _, ref generics, _, _, _)=> generics,
_ => return None
})