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

docs: fix discord link again (backport #4368) #4371

Merged
merged 2 commits into from
Sep 19, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 19, 2024


This is an automatic backport of pull request #4368 done by [Mergify](https://mergify.com).

(cherry picked from commit f66ea07)

# Conflicts:
#	readme.md
@mergify mergify bot added the conflicts label Sep 19, 2024
Copy link
Contributor Author

mergify bot commented Sep 19, 2024

Cherry-pick of f66ea07 has failed:

On branch mergify/bp/release/v28.x.y/pr-4368
Your branch is up to date with 'origin/release/v28.x.y'.

You are currently cherry-picking commit f66ea079.
  (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:   readme.md

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

@github-actions github-actions bot added component:ci CI/CD workflow and automated jobs. component:configs labels Sep 19, 2024
readme.md Outdated
@@ -24,6 +24,10 @@
</a>
<img alt="Test Status" src="https://github.com/ignite/cli/workflows/Test/badge.svg" />
<img alt="Lint Status" src="https://github.com/ignite/cli/workflows/Lint/badge.svg" />
<<<<<<< HEAD
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
<<<<<<< HEAD

readme.md Outdated
<<<<<<< HEAD
=======
<a href="https://discord.com/invite/ignite" target="_blank"><img alt="Discord" src="https://img.shields.io/discord/893126937067802685"></a>
>>>>>>> f66ea079 (docs: fix discord link again (#4368))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
>>>>>>> f66ea079 (docs: fix discord link again (#4368))

readme.md Outdated
@@ -24,6 +24,10 @@
</a>
<img alt="Test Status" src="https://github.com/ignite/cli/workflows/Test/badge.svg" />
<img alt="Lint Status" src="https://github.com/ignite/cli/workflows/Lint/badge.svg" />
<<<<<<< HEAD
=======
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
=======

@julienrbrt julienrbrt merged commit 91e72a9 into release/v28.x.y Sep 19, 2024
7 of 10 checks passed
@julienrbrt julienrbrt deleted the mergify/bp/release/v28.x.y/pr-4368 branch September 19, 2024 14:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
component:ci CI/CD workflow and automated jobs. component:configs
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants