Merge remote-tracking branch 'upstream/master' into performanceplus-m… #635
Annotations
7 errors and 1 warning
|
Compile:
osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs#L26
Merge conflict marker encountered
|
|
Compile:
osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs#L27
Merge conflict marker encountered
|
|
Compile:
osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs#L35
Merge conflict marker encountered
|
|
Compile:
osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs#L26
Merge conflict marker encountered
|
|
Compile:
osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs#L27
Merge conflict marker encountered
|
|
Compile:
osu.Game/Rulesets/Difficulty/DifficultyAttributes.cs#L35
Merge conflict marker encountered
|
|
Compile
Process completed with exit code 1.
|
|
Upload Test Results
No files were found with the provided path: D:\a\osu\osu/TestResults/TestResults-Windows-SingleThread.trx. No artifacts will be uploaded.
|
Loading