From abc163fa36fac13a90d732267484b3eeffc94668 Mon Sep 17 00:00:00 2001
From: David Zhao <nyquill@ppy.sh>
Date: Tue, 7 May 2019 12:07:45 +0900
Subject: [PATCH] Fix merge

---
 osu.Game/Rulesets/Mods/ModFlashlight.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Mods/ModFlashlight.cs b/osu.Game/Rulesets/Mods/ModFlashlight.cs
index a477868ad0..e174a25df3 100644
--- a/osu.Game/Rulesets/Mods/ModFlashlight.cs
+++ b/osu.Game/Rulesets/Mods/ModFlashlight.cs
@@ -177,7 +177,7 @@ namespace osu.Game.Rulesets.Mods
 
                     shader.GetUniform<Vector2>("flashlightPos").UpdateValue(ref flashlightPosition);
                     shader.GetUniform<Vector2>("flashlightSize").UpdateValue(ref flashlightSize);
-                    shader.GetUniform<float>("flashlightDim").UpdateValue(ref FlashlightDim);
+                    shader.GetUniform<float>("flashlightDim").UpdateValue(ref flashlightDim);
 
                     Texture.WhitePixel.DrawQuad(screenSpaceDrawQuad, DrawColourInfo.Colour, vertexAction: vertexAction);