From 1942ef9e8f09ebbecfeb51a55ea1d143595942d6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 6 Apr 2017 16:06:02 +0900
Subject: [PATCH] Fix merge fail.

---
 osu.Game/Beatmaps/Formats/OsuLegacyDecoder.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Beatmaps/Formats/OsuLegacyDecoder.cs b/osu.Game/Beatmaps/Formats/OsuLegacyDecoder.cs
index ea91ff9efb..35d81311d2 100644
--- a/osu.Game/Beatmaps/Formats/OsuLegacyDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/OsuLegacyDecoder.cs
@@ -250,7 +250,7 @@ namespace osu.Game.Beatmaps.Formats
             {
                 Time = time,
                 BeatLength = beatLength,
-                VelocityAdjustment = beatLength < 0 ? -beatLength / 100.0 : 1,
+                SpeedMultiplier = beatLength < 0 ? -beatLength / 100.0 : 1,
                 TimingChange = timingChange,
                 TimeSignature = timeSignature,
                 SampleBank = stringSampleSet,