Skip to content

Conversation

@mergify
Copy link

@mergify mergify bot commented Mar 21, 2024

Problem

#204 introduced a wrong download link 😞

Summary of Changes

correct it


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

(cherry picked from commit e682fec)

# Conflicts:
#	net/net.sh
#	scripts/agave-install-deploy.sh
@mergify mergify bot added the conflicts label Mar 21, 2024
@mergify mergify bot assigned yihau Mar 21, 2024
@mergify
Copy link
Author

mergify bot commented Mar 21, 2024

Cherry-pick of e682fec has failed:

On branch mergify/bp/v1.18/pr-219
Your branch is up to date with 'origin/v1.18'.

You are currently cherry-picking commit e682fec28e.
  (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:   net/net.sh
	both modified:   scripts/agave-install-deploy.sh

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://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@yihau yihau removed the conflicts label Mar 21, 2024
@yihau yihau requested a review from softalchemy March 21, 2024 02:46
@yihau
Copy link
Member

yihau commented Mar 21, 2024

net scripts chages, merge it on red!

@yihau yihau merged commit 14dfc41 into v1.18 Mar 21, 2024
@yihau yihau deleted the mergify/bp/v1.18/pr-219 branch March 21, 2024 02:49
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.

3 participants