From 6723a31b6a2ed37f9d9d5451511fe35d20516f28 Mon Sep 17 00:00:00 2001
From: rebtd7 <59185507+rebtd7@users.noreply.github.com>
Date: Tue, 16 Mar 2021 11:25:21 -0300
Subject: [PATCH] fix mistake when merging commits

---
 d3d9ex/AutoFix.cpp | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/d3d9ex/AutoFix.cpp b/d3d9ex/AutoFix.cpp
index 35ee094..99d4103 100644
--- a/d3d9ex/AutoFix.cpp
+++ b/d3d9ex/AutoFix.cpp
@@ -205,11 +205,6 @@ void MainContext::ForceWindowActivate(const HWND hWnd) {
 	PostMessage(hWnd, WM_ACTIVATE, WA_CLICKACTIVE, NULL);
 }
 
-void MainContext::ForceWindowActivate(const HWND hWnd) {
-	PostMessage(hWnd, WM_ACTIVATE, WA_INACTIVE, NULL);
-	PostMessage(hWnd, WM_ACTIVATE, WA_CLICKACTIVE, NULL);
-}
-
 void MainContext::FF13_OneTimeFixes() {
 
 	if (IsDXVK()) {
@@ -324,12 +319,9 @@ void MainContext::FF13_SetFrameRateVariables()
 void MainContext::FF13_2_OneTimeFixes()
 {
 	ForceWindowActivate(hWndFF13);
-<<<<<<< HEAD
 	if (IsDXVK()) {
 		PatchMessageBox(ff13_2_message_box_call_address);
 	}
-=======
->>>>>>> 86eae4b... Fix mouse input at start when using borderless mode
 
 	if (*ff13_2_frame_pacer_ptr_address) {
 		**ff13_2_frame_pacer_ptr_address = MAX_FRAME_RATE_LIMIT;