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

Update mergeRules #3076

Merged
merged 1 commit into from
May 31, 2017
Merged

Update mergeRules #3076

merged 1 commit into from
May 31, 2017

Conversation

seven-phases-max
Copy link
Member

@seven-phases-max seven-phases-max commented May 31, 2017

The primary purpose of this update is just a minor clean up, but I also changed behaviour of merging !important rules according to #2367 (comment) (note this does not fix the #2367 itself - that's another story).

@seven-phases-max seven-phases-max merged commit 488f16a into 3.x May 31, 2017
@seven-phases-max seven-phases-max deleted the merge-rules-cleanup branch May 31, 2017 20:32
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.

1 participant