Code review comment for lp:~nick-dedekind/mir/trusted_sessions

Out of step with latest landings. :(

Text conflict in src/server/frontend/session_mediator.cpp
1 conflicts encountered.

I pretty trivial - I fixed it like this:

std::function<void(std::shared_ptr<mf::Session> const&)> mf::SessionMediator::trusted_connect_handler() const
{
    return [this](std::shared_ptr<frontend::Session> const& session)
        {
            auto trust_session = weak_trust_session.lock();
            if (trust_session.get() == nullptr)
                BOOST_THROW_EXCEPTION(std::logic_error("Invalid trust session"));

            shell->add_trusted_session_for(trust_session, session->process_id());
        };
}