Skip to content

fix(mdc-button-benchmark): fix unresolved merge conflict #20221

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
Aug 12, 2020
Merged

fix(mdc-button-benchmark): fix unresolved merge conflict #20221

merged 1 commit into from
Aug 12, 2020

Conversation

wagnermaciel
Copy link
Contributor

No description provided.

@wagnermaciel wagnermaciel requested a review from a team as a code owner August 6, 2020 17:44
@googlebot googlebot added the cla: yes PR author has agreed to Google's Contributor License Agreement label Aug 6, 2020
@wagnermaciel wagnermaciel requested a review from mmalerba August 6, 2020 17:46
crisbeto
crisbeto approved these changes Aug 6, 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, a little weird that nothing threw compilation errors.

@crisbeto crisbeto added the action: merge The PR is ready for merge by the caretaker label Aug 6, 2020
@wagnermaciel
Copy link
Contributor Author

LGTM, a little weird that nothing threw compilation errors.

Yeah, we still haven't added a build check for this part of the repo

@devversion
Copy link
Member

@wagnermaciel Are you planning on doing that? I was under the impression that you wanted to take care of that.

@wagnermaciel
Copy link
Contributor Author

@wagnermaciel Are you planning on doing that? I was under the impression that you wanted to take care of that.

I can do that. I remember mentioning that this is something we needed to do but I never had time to figure out how to add it

@wagnermaciel wagnermaciel added the target: patch This PR is targeted for the next patch release label Aug 7, 2020
@wagnermaciel wagnermaciel mentioned this pull request Aug 7, 2020
Closed
@jelbourn jelbourn added the P2 The issue is important to a large percentage of users, with a workaround label Aug 7, 2020
@andrewseguin andrewseguin merged commit de3222a into angular:master Aug 12, 2020
andrewseguin pushed a commit that referenced this pull request Aug 12, 2020
@wagnermaciel @andrewseguin
fix(mdc-button-benchmark): fix unresolved merge conflict (#20221)
17fc3bd 
(cherry picked from commit de3222a)
@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 Sep 12, 2020
@wagnermaciel wagnermaciel deleted the fix-mdc-button-benchmark branch January 14, 2021 19:01
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@crisbeto crisbeto crisbeto approved these changes

@devversion devversion devversion approved these changes

@mmalerba mmalerba Awaiting requested review from mmalerba

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 P2 The issue is important to a large percentage of users, with a workaround 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.
6 participants
@wagnermaciel @devversion @crisbeto @jelbourn @googlebot @andrewseguin