merge conflicts

tari-project · Nov 28, 2024 · a225333 · a225333
1 parent 68b8e26
commit a225333
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 116 deletions.
diff --git a/base_layer/core/src/proto/block.proto b/base_layer/core/src/proto/block.proto
diff --git a/comms/core/src/connectivity/error.rs b/comms/core/src/connectivity/error.rs
@@ -43,8 +43,6 @@ pub enum ConnectivityError {
     OnlineWaitTimeout(usize),
     #[error("Pending dial was cancelled")]
     DialCancelled,
-    #[error("Client cancelled: '{0}'")]
-    ClientCancelled(String),
 }
 
 impl From<ConnectionManagerError> for ConnectivityError {