Merge conflicts

This commit is contained in:
DrabWeb
2017-03-13 09:44:22 -03:00
parent dbc8d513f9
commit 442a2c97db
5 changed files with 4 additions and 11 deletions

View File

@ -270,9 +270,9 @@ namespace osu.Game.Screens.Tournament
private void addFlags()
{
foreach (Team t in availableTeams)
foreach (Region r in availableTeams)
{
Add(new ScrollingTeam(t)
Add(new ScrollingTeam(r)
{
X = leftPos + DrawWidth
});