# Conflicts: # osu.Game/OsuGame.cs # osu.Game/OsuGameBase.cs # osu.Game/osu.Game.csproj
# Conflicts: # osu.Game/GameModes/Menu/MainMenu.cs
# Conflicts: # osu-framework
# Conflicts: # osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
# Conflicts: # osu.Game/GameModes/Menu/ButtonSystem.cs # osu.Game/OsuGame.cs
Comes with one complimentary test.
# Conflicts: # osu-framework # osu.Game/GameModes/FieldTest.cs # osu.Game/GameModes/FontTest.cs # osu.Game/GameModes/Menu/ButtonSystem.cs # osu.Game/Graphics/UserInterface/TextBox.cs # osu.Game/OsuGame.cs # osu.Game/osu.Game.csproj
Conflicts: osu-framework