Skip to content
This repository was archived by the owner on Apr 8, 2020. It is now read-only.

Conversation

@dotnet-maestro-bot
Copy link

I detected changes in the maestro/master branch which have not been merged yet to master.
I'm a robot and am configured to help you automatically keep master up to date, so
I've opened this PR.

This PR merges commits made on maestro/master by the following committers:

Instructions for merging

This PR will not be auto-merged. When pull request checks pass, please complete this PR
by creating a merge commit, not a squash or rebase commit.

merge button instructions

You can also do this on command line:

git checkout master git pull git fetch --force https://github.com/dotnet-maestro-bot/JavaScriptServices merge/maestro/master-to-master:merge/maestro/master-to-master git merge merge/maestro/master-to-master git push 

Instructions for resolving conflicts

⚠️ If there are merge conflicts, you will need to resolve them manually before merging.
You can do this using GitHub
or using the command line.

Maintainers of this repo have permission to the branch 'merge/maestro/master-to-master' on https://github.com/dotnet-maestro-bot/JavaScriptServices.
You can push changes to this branch to resolve conflicts or other issues in this pull request. The bot will attempt
to update this branch as more changes are discovered on maestro/master.

Please contact .NET Core Engineering if you have questions or issues.
Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/master/scripts/GitHubMergeBranches.ps1.

[auto-updated: dependencies]
@Eilon
Copy link
Contributor

Eilon commented Oct 16, 2018

Closing unnecessary dependency update. See https://github.com/aspnet/Infrastructure/issues/84 for details.

@Eilon Eilon closed this Oct 16, 2018
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

3 participants