Skip to content

refactor(common): fix a merge error - #25053

Closed
vicb wants to merge 1 commit into
angular:6.0.xfrom
vicb:0723-fixMergeError
Closed

vicb wants to merge 1 commit into
angular:6.0.xfrom
vicb:0723-fixMergeError

Conversation

@vicb

@vicb vicb commented Jul 24, 2018

Copy link
Copy Markdown
Contributor

A keyvalue-pipe was inadvertently pulled in When merging #25028 (commit
6eca367). This pipe is NOT in the patch branch and the test fails.

This commit remove the faulty spec.

A `keyvalue-pipe` was inadvertently pulled in  When merging angular#25028 (commit
6eca367). This pipe is NOT in the patch branch and the test fails.

This commit remove the faulty spec.
@vicb vicb added action: review The PR is still awaiting reviews from at least one requested reviewer area: common Issues related to APIs in the @angular/common package PR target: patch-only and removed cla: yes labels Jul 24, 2018
@vicb vicb added the merge: caretaker note Alert the caretaker performing the merge to check the PR for an out of normal action needed or note label Jul 24, 2018
@vicb

vicb commented Jul 24, 2018

Copy link
Copy Markdown
Contributor Author

merge-assistance: trivial, does not affect g3

@vicb vicb removed the action: review The PR is still awaiting reviews from at least one requested reviewer label Jul 24, 2018
vicb added a commit that referenced this pull request Jul 24, 2018
A `keyvalue-pipe` was inadvertently pulled in  When merging #25028 (commit
6eca367). This pipe is NOT in the patch branch and the test fails.

This commit remove the faulty spec.

PR Close #25053
@vicb

vicb commented Jul 24, 2018

Copy link
Copy Markdown
Contributor Author

merged via 5f680d4

@vicb vicb closed this Jul 24, 2018
@vicb
vicb deleted the 0723-fixMergeError branch August 3, 2018 19:08
@angular-automatic-lock-bot

Copy link
Copy Markdown

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.

Labels

area: common Issues related to APIs in the @angular/common package cla: yes merge: caretaker note Alert the caretaker performing the merge to check the PR for an out of normal action needed or note

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants