Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add new blank line inspections #4570

Merged
merged 8 commits into from May 7, 2019
Merged

Conversation

peppy
Copy link
Sponsor Member

@peppy peppy commented Apr 1, 2019

No description provided.

smoogipoo
smoogipoo previously approved these changes Apr 1, 2019
@peppy
Copy link
Sponsor Member Author

peppy commented Apr 1, 2019

Welp, blocked on new r# release I guess. (ref https://youtrack.jetbrains.com/issue/RIDER-26177)

@peppy peppy added the blocked Don't merge this. label Apr 1, 2019
# Conflicts:
#	osu.Game.Rulesets.Catch/Judgements/CatchDropletJudgement.cs
#	osu.Game.Rulesets.Catch/Judgements/CatchJudgement.cs
#	osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
#	osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs
#	osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs
#	osu.Game.Tests/Visual/SongSelect/TestCaseBeatmapScoresContainer.cs
#	osu.Game/Graphics/OsuFont.cs
#	osu.Game/Online/API/Requests/Responses/APILegacyScoreInfo.cs
#	osu.Game/Overlays/Profile/Header/BadgeContainer.cs
#	osu.Game/Overlays/Profile/ProfileHeader.cs
#	osu.Game/Screens/Select/PlaySongSelect.cs
#	osu.Game/Skinning/LegacySkinDecoder.cs
@smoogipoo
Copy link
Contributor

Unblocking because it seems the issue has been fixed in the latest rider release.

@smoogipoo smoogipoo removed the blocked Don't merge this. label May 7, 2019
smoogipoo
smoogipoo previously approved these changes May 7, 2019
@smoogipoo smoogipoo merged commit de08115 into ppy:master May 7, 2019
@peppy peppy deleted the fix-new-inspections branch May 15, 2019 04:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants