Fix conflict from merges.

This commit is contained in:
jfh
2021-10-20 09:08:15 +03:00
parent 0c07b7cbfc
commit 45b0fb3005

View File

@@ -7,7 +7,6 @@ use crate::{
common::{hash::PyHash, str::to_ascii},
function::{IntoPyObject, OptionalArg},
protocol::PyIter,
pyobject::IdProtocol,
pyref_type_error,
types::{Constructor, PyComparisonOp},
utils::Either,