mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-01-11 21:13:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Fix stray merge failure

Browse source
This commit is contained in:
Mikayla Maki 2022-10-02 18:02:25 -07:00
parent fd42811ef1
commit 56b4162023
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
crates/collab/src/rpc.rs
View file

@ -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)
}