From a2d07acb4b6089d67852b00d2cb28c6c27439c16 Mon Sep 17 00:00:00 2001
From: smoogipooo <smoogipooo@gmail.com>
Date: Fri, 17 Mar 2017 18:59:21 +0900
Subject: [PATCH] Fix post-merge errors.

---
 osu.Game.Modes.Taiko/Objects/Drawable/DrawableBash.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Modes.Taiko/Objects/Drawable/DrawableBash.cs b/osu.Game.Modes.Taiko/Objects/Drawable/DrawableBash.cs
index b69546e1aa..4e848c76c3 100644
--- a/osu.Game.Modes.Taiko/Objects/Drawable/DrawableBash.cs
+++ b/osu.Game.Modes.Taiko/Objects/Drawable/DrawableBash.cs
@@ -10,7 +10,7 @@ using System;
 
 namespace osu.Game.Modes.Taiko.Objects.Drawable
 {
-    public class DrawableBash : DrawableTaikoHitObject
+    public class DrawableBash : DrawableTaikoHitObject<Bash>
     {
         /// <summary>
         /// A list of keys which this HitObject will accept. These are the standard Taiko keys for now.
@@ -23,8 +23,8 @@ namespace osu.Game.Modes.Taiko.Objects.Drawable
         /// </summary>
         private int userHits;
 
-        public DrawableBash(TaikoHitObject hitObject)
-            : base(hitObject)
+        public DrawableBash(Bash bash)
+            : base(bash)
         {
         }