RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2024-12-14 19:06:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge conflict mess

Browse Source
This commit is contained in:
Dean Herbert 2020-03-31 22:41:16 +09:00
parent a7eda32a6e
commit a894b42a32
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
osu.Game.Rulesets.Mania/UI/Column.cs
View File

@ -33,13 +33,10 @@ namespace osu.Game.Rulesets.Mania.UI
public readonly Bindable<ManiaAction> Action = new Bindable<ManiaAction>(); public readonly Bindable<ManiaAction> Action = new Bindable<ManiaAction>();
private readonly ColumnBackground background;
private readonly ColumnKeyArea keyArea;
private readonly ColumnHitObjectArea hitObjectArea; private readonly ColumnHitObjectArea hitObjectArea;
internal readonly Container TopLevelContainer; internal readonly Container TopLevelContainer;
private readonly Container explosionContainer; private readonly Container explosionContainer;
public Column(int index) public Column(int index)
@ -133,8 +130,6 @@ namespace osu.Game.Rulesets.Mania.UI
accentColour = value; accentColour = value;
background.AccentColour = value;
keyArea.AccentColour = value;
hitObjectArea.AccentColour = value; hitObjectArea.AccentColour = value;
} }
} }