Skip to content

Conversation

crisbeto
Copy link
Member

A couple of conflicting PRs were merged in at the same time which is causing a build error, because an import was removed.

A couple of conflicting PRs were merged in at the same time which is causing a build error, because an import was removed.
@crisbeto crisbeto added P2 The issue is important to a large percentage of users, with a workaround merge safe target: patch This PR is targeted for the next patch release labels Jun 23, 2021
@crisbeto crisbeto requested a review from mmalerba June 23, 2021 04:43
@google-cla google-cla bot added the cla: yes PR author has agreed to Google's Contributor License Agreement label Jun 23, 2021
@crisbeto crisbeto added the action: merge The PR is ready for merge by the caretaker label Jun 23, 2021
@mmalerba mmalerba added target: minor This PR is targeted for the next minor release and removed target: patch This PR is targeted for the next patch release labels Jun 23, 2021
@mmalerba mmalerba merged commit 3531346 into angular:master Jun 23, 2021
mmalerba pushed a commit that referenced this pull request Jun 23, 2021
A couple of conflicting PRs were merged in at the same time which is causing a build error, because an import was removed.
mmalerba added a commit that referenced this pull request Jun 25, 2021
@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 Jul 24, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
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: minor This PR is targeted for the next minor release
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants