From 7ba0d090fc2a1491050c05c48219add0ad0306a8 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 19 Feb 2019 16:40:52 +0900
Subject: [PATCH] Fix post-merge errors

---
 .../Difficulty/TaikoDifficultyAttributes.cs                 | 6 ------
 .../Difficulty/TaikoDifficultyCalculator.cs                 | 2 +-
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyAttributes.cs b/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyAttributes.cs
index 07721e2ac5..75d3807bba 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyAttributes.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyAttributes.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Game.Rulesets.Difficulty;
-using osu.Game.Rulesets.Mods;
 
 namespace osu.Game.Rulesets.Taiko.Difficulty
 {
@@ -10,10 +9,5 @@ public class TaikoDifficultyAttributes : DifficultyAttributes
     {
         public double GreatHitWindow;
         public int MaxCombo;
-
-        public TaikoDifficultyAttributes(Mod[] mods)
-            : base(mods)
-        {
-        }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs b/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs
index 1cdb3495ae..e2c0ea7f46 100644
--- a/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs
+++ b/osu.Game.Rulesets.Taiko/Difficulty/TaikoDifficultyCalculator.cs
@@ -43,7 +43,7 @@ protected override IEnumerable<DifficultyHitObject> CreateDifficultyHitObjects(I
 
         protected override Skill[] CreateSkills() => new Skill[] { new Strain() };
 
-        protected override DifficultyAttributes CreateDifficultyAttributes(Mod[] mods) => new TaikoDifficultyAttributes(mods);
+        protected override DifficultyAttributes CreateDifficultyAttributes() => new TaikoDifficultyAttributes();
 
         protected override Mod[] DifficultyAdjustmentMods => new Mod[]
         {