Skip to content
This repository has been archived by the owner on Nov 1, 2022. It is now read-only.

For #12151 - Add support for empty step value in TimePicker (backport #12802) #12839

Closed
wants to merge 2 commits into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 23, 2022

This is an automatic backport of pull request #12802 done by Mergify.
Cherry-pick of 9da5dd7 has failed:

On branch mergify/bp/releases/106.0/pr-12802
Your branch is up to date with 'origin/releases/106.0'.

You are currently cherry-picking commit 9da5dd7d0b.
  (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:   components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/prompt/GeckoPromptDelegate.kt
	modified:   components/browser/engine-gecko/src/test/java/mozilla/components/browser/engine/gecko/prompt/GeckoPromptDelegateTest.kt

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   docs/changelog.md

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/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.com

Alexandru2909 added 2 commits September 23, 2022 22:57
(cherry picked from commit 9da5dd7)

# Conflicts:
#	docs/changelog.md
@mergify mergify bot added the conflicts label Sep 23, 2022
@mergify mergify bot deleted the mergify/bp/releases/106.0/pr-12802 branch September 23, 2022 22:57
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant