conflicts

ignite · Sep 19, 2024 · c7e86d6 · c7e86d6
1 parent 69b3eaa
commit c7e86d6
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/readme.md b/readme.md
@@ -24,10 +24,7 @@
   </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
-=======
     <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))
 </div>
 
 ![Ignite CLI](./assets/ignite-cli.png)