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

Update COPYING file (backport #750) #751

Merged
merged 4 commits into from
Jun 2, 2021
Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 1, 2021

This is an automatic backport of pull request #750 done by Mergify.
Cherry-pick of f5ac020 has failed:

On branch mergify/bp/master/pr-750
Your branch is up to date with 'origin/master'.

You are currently cherry-picking commit f5ac0200.
  (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)

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

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out 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 f5ac020)

# Conflicts:
#	COPYING
(cherry picked from commit 167b1f6)
@mergify mergify bot requested a review from a team as a code owner June 1, 2021 11:52
@mergify mergify bot added the conflicts This backport pull request has merge conflicts that need to be resolved label Jun 1, 2021
@ArnoStiefvater ArnoStiefvater enabled auto-merge June 2, 2021 04:52
@ArnoStiefvater ArnoStiefvater force-pushed the mergify/bp/master/pr-750 branch from 82cabff to dac1ce8 Compare June 2, 2021 05:51
OPENVAS_VERSION already has the git revision
if it is available.
@ArnoStiefvater ArnoStiefvater force-pushed the mergify/bp/master/pr-750 branch from dac1ce8 to 393e365 Compare June 2, 2021 06:34
@ArnoStiefvater ArnoStiefvater removed the conflicts This backport pull request has merge conflicts that need to be resolved label Jun 2, 2021
@ArnoStiefvater ArnoStiefvater merged commit c6efdae into master Jun 2, 2021
@mergify mergify bot deleted the mergify/bp/master/pr-750 branch June 2, 2021 06:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant