Skip to content

fix(column-resize): Unbreak Sass build by importing duplicate styles … #19404

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 1 commit into from
May 21, 2020
Merged

fix(column-resize): Unbreak Sass build by importing duplicate styles … #19404

merged 1 commit into from
May 21, 2020

Conversation

kseamon
Copy link
Collaborator

@kseamon kseamon commented May 20, 2020

…file

@kseamon kseamon requested a review from andrewseguin as a code owner May 20, 2020 17:14
@googlebot googlebot added the cla: yes PR author has agreed to Google's Contributor License Agreement label May 20, 2020
crisbeto
crisbeto approved these changes May 20, 2020
View reviewed changes
Copy link
Member

@crisbeto crisbeto left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@crisbeto crisbeto added lgtm action: merge The PR is ready for merge by the caretaker target: patch This PR is targeted for the next patch release labels May 20, 2020
@jelbourn jelbourn merged commit 4ad33e8 into angular:master May 21, 2020
jelbourn pushed a commit that referenced this pull request May 21, 2020
@kseamon @jelbourn
fix(column-resize): Unbreak Sass build by importing duplicate styles …
7bae4e1 
…file (#19404)
devversion added a commit to devversion/material2 that referenced this pull request May 27, 2020
@devversion
Revert "fix(column-resize): Unbreak Sass build by importing duplicate…
22fd34d 
… styles file (angular#19404)"

This reverts commit 7bae4e1.

Reverting this in the patch branch (`9.2.x`) as it's specific to the
density API refactor that did _not_ land in the `9.2.x` branch. This
fixes a failing job in the patch branch.
jelbourn pushed a commit that referenced this pull request May 27, 2020
@devversion @jelbourn
Revert "fix(column-resize): Unbreak Sass build by importing duplicate…
39a8843 
… styles file (#19404)"

This reverts commit 7bae4e1.

Reverting this in the patch branch (`9.2.x`) as it's specific to the
density API refactor that did _not_ land in the `9.2.x` branch. This
fixes a failing job in the patch branch.
@angular-automatic-lock-bot
Copy link

This issue has been automatically locked due to inactivity.
Please file a new issue if you are encountering a similar or related problem.

Read more about our automatic conversation locking policy.

This action has been performed automatically by a bot.

@angular-automatic-lock-bot angular-automatic-lock-bot bot locked and limited conversation to collaborators Jun 21, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@crisbeto crisbeto crisbeto approved these changes

@andrewseguin andrewseguin Awaiting requested review from andrewseguin

Assignees
No one assigned
Labels
action: merge The PR is ready for merge by the caretaker cla: yes PR author has agreed to Google's Contributor License Agreement target: patch This PR is targeted for the next patch release
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@kseamon @crisbeto @jelbourn @googlebot