From bf023c4342c19248762b67d9ab6de450fc4857d3 Mon Sep 17 00:00:00 2001
From: Michael <goldtextwitch@outlook.com>
Date: Sat, 1 Apr 2017 13:48:51 -0700
Subject: [PATCH] [BotW] brb firing myself

---
 Quality/BreathOfTheWild_2160p/rules.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Quality/BreathOfTheWild_2160p/rules.txt b/Quality/BreathOfTheWild_2160p/rules.txt
index 7dc537eb..67b1df8b 100644
--- a/Quality/BreathOfTheWild_2160p/rules.txt
+++ b/Quality/BreathOfTheWild_2160p/rules.txt
@@ -35,7 +35,6 @@ overwriteHeight = 1944
 #Breaks lighting effects when scaled.
 #Disabling this breaks heatwaves and shadow LODs
 [TextureRedefine] #half-res1, soft pass toon shader, 
->>>>>>> origin/master
 width = 640
 height = 360
 overwriteWidth = 1920