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

Folders: Use "Problem" icon for unresolved conflicts #6277 #352

Merged
merged 1 commit into from
Jun 5, 2018

Conversation

camilasan
Copy link
Member

@rullzer rullzer force-pushed the upstream/pr/6438 branch from c16c3b5 to 63c2474 Compare June 5, 2018 17:59
@rullzer rullzer merged commit a7b7344 into master Jun 5, 2018
@rullzer rullzer deleted the upstream/pr/6438 branch June 5, 2018 18:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants