mirror of
https://github.com/ppy/osu.git
synced 2025-01-16 10:52:55 +08:00
Fix merge fail.
This commit is contained in:
parent
4e50b28884
commit
d0b1fda24f
@ -56,7 +56,6 @@
|
|||||||
<Compile Include="Objects\Drawable\DrawableAccentedHit.cs" />
|
<Compile Include="Objects\Drawable\DrawableAccentedHit.cs" />
|
||||||
<Compile Include="Objects\Drawable\DrawableDrumRoll.cs" />
|
<Compile Include="Objects\Drawable\DrawableDrumRoll.cs" />
|
||||||
<Compile Include="Objects\Drawable\DrawableDrumRollTick.cs" />
|
<Compile Include="Objects\Drawable\DrawableDrumRollTick.cs" />
|
||||||
<Compile Include="Objects\Drawable\DrawableTaikoHitObject.cs" />
|
|
||||||
<Compile Include="Objects\Drawable\DrawableSwell.cs" />
|
<Compile Include="Objects\Drawable\DrawableSwell.cs" />
|
||||||
<Compile Include="Objects\Drawable\DrawableTaikoHitObject.cs" />
|
<Compile Include="Objects\Drawable\DrawableTaikoHitObject.cs" />
|
||||||
<Compile Include="Objects\Drawable\Pieces\AccentedCirclePiece.cs" />
|
<Compile Include="Objects\Drawable\Pieces\AccentedCirclePiece.cs" />
|
||||||
|
Loading…
Reference in New Issue
Block a user