Fixed merge-conflicts

Author: Vogel612

RetailCoder.VBE/Common/RubberduckHooks.cs

@@ -170,11 +170,11 @@ private IntPtr WindowProc(IntPtr hWnd, uint uMsg, IntPtr wParam, IntPtr lParam)
         private bool HandleHotkeyMessage(IntPtr wParam)
         {
             var processed = false;
-            if (GetWindowThread(User32.GetForegroundWindow()) == GetWindowThread(_mainWindowHandle))
-            {
-                var hook = Hooks.OfType<Hotkey>().SingleOrDefault(k => k.HotkeyInfo.HookId == (IntPtr) wParam);
-                if (hook != null)
-                {
+                            if (GetWindowThread(User32.GetForegroundWindow()) == GetWindowThread(_mainWindowHandle))
+                            {
+                var hook = Hooks.OfType<Hotkey>().SingleOrDefault(k => k.HotkeyInfo.HookId == wParam);
+                                if (hook != null)
+                                {
                     hook.OnMessageReceived();
                     processed = true;
                 }
@@ -214,4 +214,4 @@ private IntPtr GetWindowThread(IntPtr hWnd)
             return (IntPtr)hThread;
         }
     }
-}
+}