From b5763346cc0e7d4e26d7c790339d8d2c7dc07195 Mon Sep 17 00:00:00 2001
From: Vogel612 <Vogel612@gmx.de>
Date: Fri, 1 Apr 2016 14:36:35 +0200
Subject: [PATCH] Fixed merge-conflicts

---
 RetailCoder.VBE/Common/RubberduckHooks.cs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/RetailCoder.VBE/Common/RubberduckHooks.cs b/RetailCoder.VBE/Common/RubberduckHooks.cs
index 9bb1d5804c..fae2979dbc 100644
--- a/RetailCoder.VBE/Common/RubberduckHooks.cs
+++ b/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;
         }
     }
-}
\ No newline at end of file
+}