cleaned up problems during merge

Author: simzzz

sentry/src/routes.rs

@@ -152,7 +152,6 @@
 //! the [`Channel.leader`] or [`Channel.follower`].
 //!
 //! The route is handled by [`channel::validator_message::create_validator_messages()`].
->>>>>>> 630f89827d679c2e72268d956742d91f556d9e89
 //!
 //! Request body (json): [`ValidatorMessagesCreateRequest`](primitives::sentry::ValidatorMessagesCreateRequest)
 //!

sentry/src/routes/channel.rs

@@ -740,7 +740,7 @@ pub mod validator_message {
             None => Err(ResponseError::Unauthorized),
             _ => {
                 try_join_all(create_request.messages.iter().map(|message| {
-                    insert_validator_message(&app.pool, &channel, &session.uid, message)
+                    insert_validator_message(&app.pool, &channel, &auth.uid, message)
                 }))
                 .await?;