Fix rebase fallout
This commit is contained in:
parent
7af964fecf
commit
cd5d7201ad
|
@ -588,11 +588,12 @@ impl Conflicts<'a> {
|
|||
}
|
||||
|
||||
StatementKind::SetDiscriminant { .. }
|
||||
| StatementKind::StorageLive(_)
|
||||
| StatementKind::StorageDead(_)
|
||||
| StatementKind::Retag(_, _)
|
||||
| StatementKind::FakeRead(_, _)
|
||||
| StatementKind::AscribeUserType(_, _)
|
||||
| StatementKind::StorageLive(..)
|
||||
| StatementKind::StorageDead(..)
|
||||
| StatementKind::Retag(..)
|
||||
| StatementKind::FakeRead(..)
|
||||
| StatementKind::AscribeUserType(..)
|
||||
| StatementKind::Coverage(..)
|
||||
| StatementKind::Nop => {}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue