Skip to content

chore(menu): fix a11y module being imported twice from merge conflict #9538

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
Jan 23, 2018
Merged

chore(menu): fix a11y module being imported twice from merge conflict #9538

merged 1 commit into from
Jan 23, 2018

Conversation

jelbourn
Copy link
Member

No description provided.

@jelbourn jelbourn requested a review from kara as a code owner January 23, 2018 16:36
@googlebot googlebot added the cla: yes PR author has agreed to Google's Contributor License Agreement label Jan 23, 2018
crisbeto
crisbeto reviewed Jan 23, 2018
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 pr: lgtm action: merge The PR is ready for merge by the caretaker labels Jan 23, 2018
@jelbourn jelbourn merged commit 99cc2e4 into angular:master Jan 23, 2018
@jelbourn jelbourn deleted the menu-module-merge-fix branch January 23, 2018 16:44
@jelbourn jelbourn added the target: patch This PR is targeted for the next patch release label Jan 29, 2018
@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 8, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@crisbeto crisbeto crisbeto left review comments

@josephperrott josephperrott Awaiting requested review from josephperrott

@kara kara Awaiting requested review from kara

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.
3 participants
@jelbourn @crisbeto @googlebot