mirror of
https://github.com/ppy/osu.git
synced 2026-06-04 20:34:14 +08:00
Remove incorrectly merge conflict resolved
This commit is contained in:
@@ -23,8 +23,6 @@ namespace osu.Game.Storyboards.Drawables
|
||||
{
|
||||
public partial class DrawableStoryboard : Container<DrawableStoryboardLayer>
|
||||
{
|
||||
public Vector2 AppliedScale { get; private set; }
|
||||
|
||||
[Cached(typeof(Storyboard))]
|
||||
public Storyboard Storyboard { get; }
|
||||
|
||||
|
||||
Reference in New Issue
Block a user