1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-07 10:57:51 +08:00

Fix merge fail.

This commit is contained in:
Dean Herbert 2017-03-27 12:33:15 +09:00 committed by GitHub
parent 4e50b28884
commit d0b1fda24f

View File

@ -56,7 +56,6 @@
<Compile Include="Objects\Drawable\DrawableAccentedHit.cs" />
<Compile Include="Objects\Drawable\DrawableDrumRoll.cs" />
<Compile Include="Objects\Drawable\DrawableDrumRollTick.cs" />
<Compile Include="Objects\Drawable\DrawableTaikoHitObject.cs" />
<Compile Include="Objects\Drawable\DrawableSwell.cs" />
<Compile Include="Objects\Drawable\DrawableTaikoHitObject.cs" />
<Compile Include="Objects\Drawable\Pieces\AccentedCirclePiece.cs" />
@ -103,4 +102,4 @@
<Target Name="AfterBuild">
</Target>
-->
</Project>
</Project>