1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-13 08:32:57 +08:00

Remove incorrectly merge conflict resolved

This commit is contained in:
Dean Herbert 2023-09-20 12:54:28 +09:00
parent 4a7dc4d792
commit 50adb5f7a7

View File

@ -23,8 +23,6 @@ namespace osu.Game.Storyboards.Drawables
{ {
public partial class DrawableStoryboard : Container<DrawableStoryboardLayer> public partial class DrawableStoryboard : Container<DrawableStoryboardLayer>
{ {
public Vector2 AppliedScale { get; private set; }
[Cached(typeof(Storyboard))] [Cached(typeof(Storyboard))]
public Storyboard Storyboard { get; } public Storyboard Storyboard { get; }