From 45b0fb300540ec830831c3e78c8fa4af7299267f Mon Sep 17 00:00:00 2001
From: jfh <jfh@imijmi.eu>
Date: Wed, 20 Oct 2021 09:08:15 +0300
Subject: [PATCH] Fix conflict from merges.

---
 vm/src/protocol/object.rs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/vm/src/protocol/object.rs b/vm/src/protocol/object.rs
index 4ee03693b..9ba6ebe6e 100644
--- a/vm/src/protocol/object.rs
+++ b/vm/src/protocol/object.rs
@@ -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,