Fix stray merge failure

2022-10-02 18:02:25 -07:00
parent fd42811ef1
commit 56b4162023
1 changed files with 1 additions and 4 deletions
--- 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)
    }