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.

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

build(bazel): fix merge conflict between c4f02e2 and ef956a2 #21453

Closed
wants to merge 1 commit into from
Closed

build(bazel): fix merge conflict between c4f02e2 and ef956a2 #21453

wants to merge 1 commit into from

Conversation

alexeagle
Copy link
Contributor

No description provided.

@alexeagle alexeagle added area: bazel Issues related to the published `@angular/bazel` build rules target: patch This PR is targeted for the next patch release labels Jan 10, 2018
@alexeagle alexeagle added the action: merge The PR is ready for merge by the caretaker label Jan 10, 2018
alexeagle added a commit that referenced this pull request Jan 10, 2018
@alexeagle
build(bazel): fix merge conflict between c4f02e2 and ef956a2 (#21453)
650f5fb 
PR Close #21453
@alexeagle alexeagle closed this in 2ad92ed Jan 10, 2018
leo6104 pushed a commit to leo6104/angular that referenced this pull request Mar 25, 2018
@alexeagle @leo6104
build(bazel): fix merge conflict between c4f02e2 and ef956a2 (angular…
afde726 
…#21453)

PR Close angular#21453
@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 13, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@chuckjaz chuckjaz chuckjaz approved these changes

@mhevery mhevery Awaiting requested review from mhevery

Assignees
No one assigned
Labels
action: merge The PR is ready for merge by the caretaker area: bazel Issues related to the published `@angular/bazel` build rules cla: yes 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.

None yet
3 participants
@alexeagle @chuckjaz @googlebot