Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

removing deps that are no longer needed (bp #781) #782

Merged
merged 2 commits into from
Mar 22, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 22, 2021

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

Cherry-pick of 98f228d has failed:

On branch mergify/bp/release/v4.1.x/pr-781
Your branch is up to date with 'origin/release/v4.1.x'.

You are currently cherry-picking commit 98f228d.
  (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:   app/migrate.go
	deleted:    app/prop29.go
	deleted:    app/prop29_test.go
	modified:   go.mod

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

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 98f228d)

# Conflicts:
#	go.sum
@codecov
Copy link

codecov bot commented Mar 22, 2021

Codecov Report

❗ No coverage uploaded for pull request base (release/v4.1.x@ca15d27). Click here to learn what that means.
The diff coverage is n/a.

@@               Coverage Diff                @@
##             release/v4.1.x    #782   +/-   ##
================================================
  Coverage                  ?   0.41%           
================================================
  Files                     ?       7           
  Lines                     ?     483           
  Branches                  ?       0           
================================================
  Hits                      ?       2           
  Misses                    ?     480           
  Partials                  ?       1           

@shahankhatch shahankhatch merged commit aefa7ab into release/v4.1.x Mar 22, 2021
@shahankhatch shahankhatch deleted the mergify/bp/release/v4.1.x/pr-781 branch March 22, 2021 12:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants