Skip to content
This repository has been archived by the owner on Aug 20, 2024. It is now read-only.

Bump to Scala 2.12.13 and 2.13.4 (bp #2053) #2054

Merged
merged 2 commits into from
Jan 22, 2021
Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 22, 2021

This is an automatic backport of pull request #2053 done by Mergify.

Cherry-pick of e323094 has failed:

On branch mergify/bp/1.4.x/pr-2053
Your branch is up to date with 'origin/1.4.x'.

You are currently cherry-picking commit e3230941.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   project/plugins.sbt

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   build.sbt

To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.io/

(cherry picked from commit e323094)

# Conflicts:
#	build.sbt
@mergify mergify bot added bp-conflict Backport Automated backport, please consider for minor release labels Jan 22, 2021
@mergify mergify bot merged commit b19c56a into 1.4.x Jan 22, 2021
@mergify mergify bot deleted the mergify/bp/1.4.x/pr-2053 branch January 22, 2021 23:07
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Backport Automated backport, please consider for minor release
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant