1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-15 17:17:26 +08:00

fix merge conflict

This commit is contained in:
OliBomby 2023-06-02 01:02:35 +02:00
parent 3f7bebfda4
commit 3f96795bbf

View File

@ -109,7 +109,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
}, },
new SamplePointPiece(Item) samplePointPiece = new SamplePointPiece(Item)
{ {
Anchor = Anchor.BottomLeft, Anchor = Anchor.BottomLeft,
Origin = Anchor.TopCentre, Origin = Anchor.TopCentre,