From 3325b0cc95d314e700a3e4d928fac9cf6b61c229 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Mon, 16 Aug 2021 14:50:08 +0200
Subject: [PATCH] Fix merge conflicts.

---
 osu.Game/Overlays/BeatmapSet/BasicStats.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/BeatmapSet/BasicStats.cs b/osu.Game/Overlays/BeatmapSet/BasicStats.cs
index dfba93cdbd..80dc185bb5 100644
--- a/osu.Game/Overlays/BeatmapSet/BasicStats.cs
+++ b/osu.Game/Overlays/BeatmapSet/BasicStats.cs
@@ -107,7 +107,7 @@ namespace osu.Game.Overlays.BeatmapSet
                 set => this.value.Text = value;
             }
 
-            public Statistic(BeatmapStatisticsIconType icon, string name)
+            public Statistic(BeatmapStatisticsIconType icon, LocalisableString name)
             {
                 TooltipText = name;
                 RelativeSizeAxes = Axes.X;