Code review comment for lp:~raof/mir/fixish-wayland-keyboard

Unneccessary, conflicting change:

<<<<<<< TREE
struct MockWindowManagementPolicy : mir_test_framework::CanonicalWindowManagerPolicy,
                                    miral::WindowManagementPolicyAddendum2
=======
#if defined(__clang__)
    #pragma GCC diagnostic push
    #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif
struct MockWindowManager : mir::shell::CanonicalWindowManager
>>>>>>> MERGE-SOURCE
{
<<<<<<< TREE
    MockWindowManagementPolicy(
        miral::WindowManagerTools const& tools,
        MockWindowManagementPolicy*& self) :
        mir_test_framework::CanonicalWindowManagerPolicy(tools)
    {
        self = this;
    }
=======
    using mir::shell::CanonicalWindowManager::CanonicalWindowManager;
#if defined(__clang__)
    #pragma GCC diagnostic pop
#endif
>>>>>>> MERGE-SOURCE