From c7e86d69ad8dd703b648935617d4c96cb9cb3044 Mon Sep 17 00:00:00 2001
From: Julien Robert <julien@rbrt.fr>
Date: Thu, 19 Sep 2024 16:38:35 +0200
Subject: [PATCH] conflicts

---
 readme.md | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/readme.md b/readme.md
index 7efdf09fa3..625930ca80 100644
--- 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)