From c208f489b7d4cd94d438b2a0f10a6283c2d0cf06 Mon Sep 17 00:00:00 2001
From: Dorian BOYER <dboyer.cda@formation.local>
Date: Tue, 22 Oct 2024 09:41:37 +0400
Subject: [PATCH] test

---
 Cheun.md.txt | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Cheun.md.txt b/Cheun.md.txt
index 7359e36..26031b8 100644
--- a/Cheun.md.txt
+++ b/Cheun.md.txt
@@ -1,5 +1,4 @@
-<<<<<<< HEAD
 jkerklg,eorfiopefr
-=======
+
 AHAHAHHAHA GOTAGAAAAAAA, alors les gentle mate
 >>>>>>> d6c65328bfa0b5937a6a1944aeafa12e384d5216