Skip to content

Update tslint to expect Google LLC rather than Google Inc for file headers#20629

Merged
alan-agius4 merged 2 commits intoangular:masterfrom
josephperrott:header-fix
Apr 27, 2021
Merged

Update tslint to expect Google LLC rather than Google Inc for file headers#20629
alan-agius4 merged 2 commits intoangular:masterfrom
josephperrott:header-fix

Conversation

@josephperrott
Copy link
Copy Markdown
Member

@josephperrott josephperrott commented Apr 26, 2021

See individual commits.

This change only causes conflicts in 1 PR, the other PRs are either unaffected or target a different branch.

$ yarn ng-dev pr discover-new-conflicts 20629
Retrieved 31 total pending PRs
Checking 6 PRs for conflicts after a merge of #20629
[========================================] ETA: 0s | 6/6

Result:
1 PR(s) which conflict(s) after #20629 merges:
    - #20556: fix(@angular/cli): Support XDG Base Directory Specfication

@josephperrott josephperrott added action: review The PR is still awaiting reviews from at least one requested reviewer target: patch This PR is targeted for the next patch release area: build & ci Related the build and CI infrastructure of the project labels Apr 26, 2021
@google-cla google-cla bot added the cla: yes label Apr 26, 2021
@josephperrott josephperrott marked this pull request as ready for review April 26, 2021 22:27
@alan-agius4 alan-agius4 added action: merge The PR is ready for merge by the caretaker target: rc This PR is targeted for the next release-candidate and removed action: review The PR is still awaiting reviews from at least one requested reviewer target: patch This PR is targeted for the next patch release labels Apr 27, 2021
@alan-agius4 alan-agius4 merged commit 0038542 into angular:master Apr 27, 2021
@alan-agius4
Copy link
Copy Markdown
Collaborator

@josephperrott, can you please create a separate PR for patch versions as it has conflicts? Thanks

@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 May 28, 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 area: build & ci Related the build and CI infrastructure of the project target: rc This PR is targeted for the next release-candidate

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants