From 56b416202386c80fa91f3fa159ed32cd7bc3fa32 Mon Sep 17 00:00:00 2001 From: Mikayla Maki Date: Sun, 2 Oct 2022 18:02:25 -0700 Subject: [PATCH] Fix stray merge failure --- crates/collab/src/rpc.rs | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/crates/collab/src/rpc.rs b/crates/collab/src/rpc.rs index 15748a52cf..beba653fc6 100644 --- a/crates/collab/src/rpc.rs +++ b/crates/collab/src/rpc.rs @@ -206,11 +206,8 @@ impl Server { .add_message_handler(Server::unfollow) .add_message_handler(Server::update_followers) .add_request_handler(Server::get_channel_messages) -<<<<<<< HEAD - .add_message_handler(Server::update_head_text); -======= + .add_message_handler(Server::update_head_text) .add_request_handler(Server::get_private_user_info); ->>>>>>> 5d09083a (Identify users in amplitude via a separate 'metrics_id' UUID) Arc::new(server) }