1
0
mirror of https://github.com/ppy/osu.git synced 2025-01-28 23:52:54 +08:00

Fix merge conflicts.

This commit is contained in:
Lucas A 2021-08-16 14:50:08 +02:00
parent a0a9777109
commit 3325b0cc95

View File

@ -107,7 +107,7 @@ namespace osu.Game.Overlays.BeatmapSet
set => this.value.Text = value; set => this.value.Text = value;
} }
public Statistic(BeatmapStatisticsIconType icon, string name) public Statistic(BeatmapStatisticsIconType icon, LocalisableString name)
{ {
TooltipText = name; TooltipText = name;
RelativeSizeAxes = Axes.X; RelativeSizeAxes = Axes.X;