Resolve merge conflicts

This commit is contained in:
Roman Kapustin
2018-11-18 16:10:36 +03:00
250 changed files with 6078 additions and 2591 deletions

View File

@ -5,7 +5,7 @@ using System.ComponentModel;
namespace osu.Game.Configuration
{
public enum SpeedChangeVisualisationMethod
public enum ScrollVisualisationMethod
{
[Description("Sequential")]
Sequential,