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:
parent
3f7bebfda4
commit
3f96795bbf
@ -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,
|
||||||
|
Loading…
Reference in New Issue
Block a user