From 49fbf2b177e09df1a4aad6cc36832f222eab2cc4 Mon Sep 17 00:00:00 2001
From: Peter Thoman <peter@metaclassofnil.com>
Date: Fri, 3 May 2013 02:57:23 +0200
Subject: [PATCH] Fixed merging messup

---
 Core/Config.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Core/Config.h b/Core/Config.h
index 870d200d2a..14cc3e6f3e 100644
--- a/Core/Config.h
+++ b/Core/Config.h
@@ -72,7 +72,6 @@ public:
 	int iAnisotropyLevel;
 	bool bTrueColor;
 	bool bMipMap;
-	bool bAnisotropicFiltering;
 	int iTexScalingLevel; // 1 = off, 2 = 2x, ..., 5 = 5x
 	int iTexScalingType; // 0 = Bilinear, 1 = xBRZ, 2 = Hybrid